1

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/sys/CustomerBillingServiceImpl.java

@@ -61,6 +61,9 @@ public class CustomerBillingServiceImpl implements CustomerBillingService {
         if (!StringUtils.isEmpty(selectDTO.getPayNo())) {
             wrapper.like("pay_no", selectDTO.getPayNo());
         }
+        if (!StringUtils.isEmpty(selectDTO.getCustomer())) {
+            wrapper.eq("customer", selectDTO.getCustomer());
+        }
         if (!StringUtils.isEmpty(selectDTO.getBusinessType())) {
             wrapper.eq("business_type", selectDTO.getBusinessType());
         }
@@ -222,9 +225,9 @@ public class CustomerBillingServiceImpl implements CustomerBillingService {
                         customerBillingDetailDO.setTruckCost(customerBillingInfoDTO.getTruckCost());
                         customerBillingDetailDO.setOtherExpenses(customerBillingInfoDTO.getOtherExpenses());
                         customerBillingDetailDO.setOtherCost(customerBillingInfoDTO.getOtherCost());
-                        customerBillingDetailDO.setPricePayable(customerBillingInfoDTO.getClearanceFee() + customerBillingInfoDTO.getTruck() + customerBillingInfoDTO.getOtherExpenses());
+                        customerBillingDetailDO.setPricePayable((customerBillingInfoDTO.getClearanceFee()!=null?customerBillingInfoDTO.getClearanceFee():0) + (customerBillingInfoDTO.getTruck()!=null?customerBillingInfoDTO.getTruck():0)  + (customerBillingInfoDTO.getOtherExpenses()!=null?customerBillingInfoDTO.getOtherExpenses():0));
                         amount = amount + customerBillingDetailDO.getPricePayable();
-                        customerBillingDetailDO.setCost(customerBillingInfoDTO.getClearanceCost() + customerBillingInfoDTO.getTruckCost() + customerBillingInfoDTO.getOtherCost());
+                        customerBillingDetailDO.setCost((customerBillingInfoDTO.getClearanceCost()!=null?customerBillingInfoDTO.getClearanceCost():0) + (customerBillingInfoDTO.getTruckCost()!=null?customerBillingInfoDTO.getTruckCost():0) + (customerBillingInfoDTO.getOtherCost()!=null?customerBillingInfoDTO.getOtherCost():0));
 //                    cost =cost+customerBillingDetailDO.getCost();
                         customerBillingDetailDO.setGmtUpdate(now);
                         customerBillingDetailDO.setGmtCreate(now);

unimall-data/src/main/java/com/iotechn/unimall/data/dto/CustomerBillingInfoDTO.java

@@ -50,7 +50,7 @@ public class CustomerBillingInfoDTO extends SuperDTO {
      @Excel(name = "备注2")
     private String remark;
      /* 状态 */
-     @Excel(name = "状态",readConverterExp = "1=未付款,2=部分付款,2=已付款")
+     @Excel(name = "状态",readConverterExp = "1=未付款,2=部分付款,3=已付款")
     private Integer status;
      /* gmtCreate */
     private Date gmtCreate;
@@ -74,35 +74,26 @@ public class CustomerBillingInfoDTO extends SuperDTO {
     private String endDate;
 
     /* 柜号 */
-    @Excel(name = "柜号")
     private String cabinetNo;
     /* 到港日期 */
-    @Excel(name = "到港日期")
     private String arrivalDate;
     /* 产品 */
-    @Excel(name = "货品")
     private String product;
     /* 发货公司 */
-    @Excel(name = "发货公司")
     private String sendComp;
     /* 车队 */
-    @Excel(name = "车队")
     private String carTeam;
     /* 送货地点 */
-    @Excel(name = "目的地")
     private String deliveryPlace;
     /* 清关费 */
-    @Excel(name = "清关费")
     private Double clearanceFee;
     /* 清关成本 */
     private Double clearanceCost;
     /* 卡车 */
-    @Excel(name = "卡车")
     private Double truck;
     /* 卡车成本 */
     private Double truckCost;
     /* 其他费用 */
-    @Excel(name = "其他费用")
     private Double otherExpenses;
     /* 其他成本 */
     private Double otherCost;