需求

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

@@ -33,4 +33,12 @@ public interface WebsitSalesRetCMapper {
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WebsitPartsFactoryRetVO> pagePartsFactoryRetV2(Page page,@Param("ex")  ZfireParamBean zfireParam, @Param("companyWechatIds")List<String> companyWechatIds);
+
+
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
+    IPage<WorkerSettlementLineVO> 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

@@ -234,6 +234,8 @@ public class PolicyOrderLogic {
                 policyOrder.setBuyUnitId(sysDictCompany.getDictCode());
 
 
+
+
                 if (new Date().after(policyOrder.getStartTime()) && new Date().before(policyOrder.getEndTime()))
                     policyOrder.setPolicyOrderStatus("BZZ");
                 else if (new Date().after(policyOrder.getEndTime()))
@@ -283,6 +285,10 @@ 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)));
+
 
                 if (new Date().after(policyOrderup.getStartTime()) && new Date().before(policyOrderup.getEndTime()))
                     policyOrderup.setPolicyOrderStatus("BZZ");

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

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