需求

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/WebsitSalesRetCMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.websit.*;
+import com.gree.mall.manager.bean.worker.SettlementPgOrderVO;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -36,9 +37,9 @@ public interface WebsitSalesRetCMapper {
 
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<WorkerSettlementLineVO> pgOrderList(Page page,
-                                              @Param("ex") ZfireParamBean zfireParam,
-                                              @Param("overTime") String overTime,
-                                              @Param("overEndTime") String overEndTime
+    IPage<SettlementPgOrderVO> pgOrderList(Page page,
+                                           @Param("ex") ZfireParamBean zfireParam,
+                                           @Param("overTime") String overTime,
+                                           @Param("overEndTime") String overEndTime
                                               );
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -285,9 +285,9 @@ public class PolicyOrderLogic {
                 policyOrderup.setBuyUnit(sysDictCompany.getDictValue());
                 policyOrderup.setBuyUnitId(sysDictCompany.getDictCode());
 
-                policyOrder.setClassWebsitId((String)row.get(11));
-                policyOrder.setClassWebsitName((String)row.get(12));
-                policyOrder.setPayAmount(Convert.toBigDecimal(row.get(8)));
+                policyOrderup.setClassWebsitId((String)row.get(11));
+                policyOrderup.setClassWebsitName((String)row.get(12));
+                policyOrderup.setPayAmount(Convert.toBigDecimal(row.get(8)));
 
 
                 if (new Date().after(policyOrderup.getStartTime()) && new Date().before(policyOrderup.getEndTime()))

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -803,13 +803,14 @@ public class SettlementOrderLogic {
 
         //1.组装查询条件
         ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean, SettlementPgOrderVO.class, adminUser);
-/*        IPage<SettlementPgOrderVO> settlementOrderLogicVOIPage = websitSalesRetCMapper.pgOrderList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),zfireParamBean.getOverTime(),zfireParamBean.getOverEndTime(),
-                zfireParam
-                , companyWechatIds);*/
+        IPage<SettlementPgOrderVO> settlementOrderLogicVOIPage = websitSalesRetCMapper.pgOrderList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
+                zfireParam,
+                zfireParamBean.getOverTime(),
+                zfireParamBean.getOverEndTime()
+               );
 
-     //   return settlementOrderLogicVOIPage;
+        return settlementOrderLogicVOIPage;
 
-        return new Page<>();
     }
 
 /*

mall-server-api/src/main/resources/mapper/WebsitSalesCMapper.xml

@@ -171,4 +171,8 @@
         </if>
         ${ex.orderBy}
     </select>
+
+    <select id="pgOrderList" resultType="com.gree.mall.manager.bean.worker.SettlementPgOrderVO">
+
+    </select>
 </mapper>