Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/SettlementPgOrderVO.java

@@ -57,7 +57,7 @@ public class SettlementPgOrderVO {
     private Integer sbzts;
 
     @ZfireField(isQuery = false)
-    @ApiModelProperty(value = "电子支付工单数量（台）")
+    @ApiModelProperty(value = "电子支付工单数量（单）")
     private Integer dzzfs=0;
 
     @ZfireField(isQuery = false)

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

@@ -815,13 +815,15 @@ public class SettlementOrderLogic {
         List<PgOrderBase> pgOrderBases = pgOrderBaseService.lambdaQuery()
                 .between(PgOrderBase::getOverTime, zfireParamBean.getOverTime(), zfireParamBean.getOverEndTime())
                 .in(PgOrderBase::getOrderStatus,"YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
-                .select(PgOrderBase::getId,PgOrderBase::getOrderSmallTypeText,PgOrderBase::getWebsitId,PgOrderBase::getTotalNum)
+                .select(PgOrderBase::getId,PgOrderBase::getOrderSmallTypeText,PgOrderBase::getWebsitId,PgOrderBase::getTotalNum,PgOrderBase::getWorkerNumber)
                 .list();
 
         List<String> orderBaseIds = pgOrderBases.stream().map(PgOrderBase::getId).collect(Collectors.toList());
 
         List<WorkerOrder> workerOrders = workerOrderService.lambdaQuery()
-                .in(WorkerOrder::getWorkerOrderId, orderBaseIds).list();
+                .in(WorkerOrder::getWorkerOrderId, orderBaseIds)
+                .eq(WorkerOrder::getPayStatus,"PAID")
+                .list();
 
 
         for (SettlementPgOrderVO record : settlementOrderLogicVOIPage.getRecords()) {
@@ -841,7 +843,7 @@ public class SettlementOrderLogic {
             List<WorkerOrder> workerOrderList = workerOrders.stream().filter(
                     item -> item.getWorkerNumber().equals(record.getWorkerNumber())
                             && item.getWebsitId().equals(record.getWebsitId())
-                            && orderBaseIdWorker.contains(item.getOrderId())
+                            && orderBaseIdWorker.contains(item.getWorkerOrderId())
             ).collect(Collectors.toList());
 
             List<String> orderWorkerIds = workerOrderList.stream().map(WorkerOrder::getWorkerOrderId).distinct().collect(Collectors.toList());
@@ -852,7 +854,7 @@ public class SettlementOrderLogic {
             List<PgOrderBase> pgOrderBaseList1 = pgOrderBases.stream().filter(item -> orderWorkerIds.contains(item.getId()))
                     .collect(Collectors.toList());
 
-            record.setDzzfs(orderBaseIds.size());
+            record.setDzzfs(pgOrderBaseList1.size());
             int sum = pgOrderBaseList1.stream().mapToInt(PgOrderBase::getTotalNum).sum();
 
             record.setDzzfsbts(sum);
@@ -860,8 +862,8 @@ public class SettlementOrderLogic {
             BigDecimal bigDecimal = workerOrderList.stream().map(WorkerOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 
             record.setDzzfzje(bigDecimal);
-            record.setDzzfpjfy(record.getDzzfsbts() > 0 ?bigDecimal.divide(Convert.toBigDecimal(record.getDzzfsbts())):BigDecimal.ZERO);
-            record.setDzzfzpjfy(record.getDzzfsbts() > 0 ?bigDecimal.divide(Convert.toBigDecimal(record.getDzzfsbts())):BigDecimal.ZERO);
+            record.setDzzfpjfy(record.getDzzfsbts() > 0 ?bigDecimal.divide(Convert.toBigDecimal(record.getDzzfsbts()),2,BigDecimal.ROUND_HALF_UP):BigDecimal.ZERO);
+            record.setDzzfzpjfy(record.getDzzfsbts() > 0 ?bigDecimal.divide(Convert.toBigDecimal(record.getDzzfsbts()),2,BigDecimal.ROUND_HALF_UP):BigDecimal.ZERO);
 
 
         }