Merge branch 'master_chw_publish' into dev-chw

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/ReceiveVo.java

@@ -29,6 +29,14 @@ public class ReceiveVo extends VehiclePublishReceive {
     @ApiModelProperty("拒绝数量")
     Long refusedNumber;
 
+
+    private  BigDecimal payAmount;
+
+    private  BigDecimal goodsAmount;
+
+    private  BigDecimal refusedAmount;
+
+
     @ApiModelProperty("按钮状态：1-待确认；2-已确认；3-已完成;4-已取消")
     private  Integer buttonState;
 
@@ -63,4 +71,6 @@ public class ReceiveVo extends VehiclePublishReceive {
     private  List<VehiclePublishReceiveVo> publishReceiveVos;
 
 
+
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -474,6 +474,14 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
                 receiveDTO.setIds(idList);
                 receiveVo.setPublishReceiveVos(getListByIds(receiveDTO));
             }
+            String statusStr = receiveVo.getStatusStr();
+            BigDecimal refusedAmount = BigDecimal.ZERO;
+            if (StringUtils.isNotBlank(statusStr)) {
+                List<Integer> statusIds = Arrays.asList(statusStr.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+                Long refusedNumber = statusIds.stream().filter(x -> x == 2).count();
+                refusedAmount = receiveVo.getGoodsAmount().multiply(new BigDecimal(refusedNumber));
+            }
+            receiveVo.setRefusedAmount(refusedAmount);
             return  receiveVo;
         }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishReceiveMapper.xml

@@ -105,7 +105,9 @@
         GROUP_CONCAT(r.`status`) statusStr,
         GROUP_CONCAT(r.`id`) ids,
         r.cover,
-        r.publish_company_id as publishCompanyId
+        r.publish_company_id as publishCompanyId,
+        IFNULL(SUM(g.receive_amount),0) as payAmount,
+        IFNULL(g.receive_amount,0) as goodsAmount
         FROM vehicle_publish_receive r
         LEFT JOIN vehicle_publish_goods g ON r.publish_goods_id = g.id
         LEFT JOIN vehicle_publish p ON g.publish_id = p.id