Merge branch 'master_chw_publish' into dev-chw

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderPulishReceiveService.java

@@ -123,9 +123,15 @@ public class OrderPulishReceiveService extends AbstractOrderHandle<OrderPulishRe
         List<VehiclePublishReceiveVo> receiveVos = detail.getReceiveVos();
         BigDecimal receiveAmount = BigDecimal.ZERO;
         if (receiveVos.size() > 0 ) {
-             receiveAmount = receiveVos.parallelStream().filter(oadTemp ->
-                    (Integer.valueOf(VehiclePublishReceiveDTO.ADD).equals(oadTemp.getStatus()))
-            ).map(VehiclePublishReceiveVo::getReceiveAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            if (detail.getType().equals(1)){
+                receiveAmount = receiveVos.parallelStream().filter(oadTemp ->
+                        (Integer.valueOf(VehiclePublishReceiveDTO.ADD).equals(oadTemp.getStatus()))
+                ).map(VehiclePublishReceiveVo::getReceiveAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            }else {
+                receiveAmount = receiveVos.parallelStream().filter(oadTemp ->
+                        (Integer.valueOf(VehiclePublishReceiveDTO.PAY).equals(oadTemp.getStatus()))
+                ).map(VehiclePublishReceiveVo::getPublishAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            }
         }
 
         //商品价格

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehiclePublishGoodsMapper.java

@@ -19,7 +19,7 @@ public interface VehiclePublishGoodsMapper extends Mapper<VehiclePublishGoods>,
 
     List<VehiclePublishGoodsVo> selectListByOrderNo(VehiclePublishFindDTO publishFindDTO);
 
-    @Select("SELECT r.publish_goods_id as id,IFNULL(COUNT(r.id)) as receiveNumber  FROM vehicle_publish_receive r \n" +
+    @Select("SELECT r.publish_goods_id as id,IFNULL(COUNT(r.id),0) as receiveNumber  FROM vehicle_publish_receive r \n" +
             "\n" +
             "LEFT JOIN vehicle_publish_goods  g ON r.publish_goods_id = g.id\n" +
             "\n" +