pc端未售买断推送

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Author dimengzhe
  * @Date 2022/9/19 11:52
@@ -14,17 +16,23 @@ public class BaseVehicleActualPayDto implements Dto {
     private static final long serialVersionUID = -7136887711471736748L;
 
     @ApiModelProperty(value = "付款方式")
+    @NotBlank(message = "付款方式不能为空")
     private String paymentType;
     @ApiModelProperty(value = "付款方式key")
+    @NotBlank(message = "付款方式不能为空")
     private String paymentTypeKey;
     @ApiModelProperty(value = "厂家销售通路")
+    @NotBlank(message = "厂家销售通路不能为空")
     private String actualPay;
     @ApiModelProperty(value = "开户行")
+    @NotBlank(message = "开户行不能为空")
     private String bank;
 
     @ApiModelProperty("收款银行账号")
+    @NotBlank(message = "收款银行账号不能为空")
     private String receivingAccount;
     @ApiModelProperty("付款金额")
+    @NotBlank(message = "付款金额不能为空")
     private String payAccount;
     @ApiModelProperty("付款备注")
     private String payRemark;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java

@@ -28,4 +28,6 @@ public class BaseVehicleActualPayVo implements Vo {
     private String payAccount;
     @ApiModelProperty("付款备注")
     private String payRemark;
+
+    private String sid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java

@@ -7,6 +7,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 import java.util.List;
@@ -33,7 +34,9 @@ public class BaseVehicleActualSalesDto implements Dto {
     @ApiModelProperty(value = "买断原因")
     private String reason;
     @ApiModelProperty(value = "车辆列表")
+
     private List<BaseVehicleActualDetailsDto> detailsList;
+    @Valid
     private List<BaseVehicleActualPayDto> detailsPayList;
 
     @ApiModelProperty("未售买断费用")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java

@@ -60,4 +60,22 @@ public class DictCommonEnum {
         }
     }
 
+    /**
+     * 款项名称
+     */
+    @Getter
+    public static enum costType {
+        CG_TYPE("001", "排产"),
+        WC_TYPE("002", "外采"),
+        MD_TYPE("003", "买断"),
+        ;
+        private final String code;
+        private final String remarks;
+
+        costType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -21,7 +21,11 @@ import com.yxt.anrui.base.api.basevehicleactualsales.flow.SubmitActualSalesDto;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicleactualdetails.BaseVehicleActualDetailsService;
 import com.yxt.anrui.base.biz.basevehicleactualpay.BaseVehicleActualPayService;
+import com.yxt.anrui.base.common.enums.DictCommonEnum;
+import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
+import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -83,6 +87,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
     private MessageFeign messageFeign;
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
+    @Autowired
+    private FinPaymentrecordFeign finPaymentrecordFeign;
 
     /**
      * 分页列表
@@ -448,32 +454,26 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             } else {
-
-              /*  if (busVehicleApply.getCurrentAmount() > 0) {
+                if ("1".equals(baseVehicleActualSales.getIsPay())) {
+                    List<BaseVehicleActualPayVo> voPayList = baseVehicleActualPayService.detailsList(baseVehicleActualSales.getSid());
+                    for (BaseVehicleActualPayVo v : voPayList) {
                         FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
-                    finPaymentrecordDto.setApplySid(busVehicleApply.getSid());
-                    finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid());
+                        finPaymentrecordDto.setApplySid(v.getSid());
+                        finPaymentrecordDto.setPayCompanySid(baseVehicleActualSales.getUseOrgSid());
                         finPaymentrecordDto.setPayType(1);
-                    finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
-                    finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
-                    finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
-                    finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode());
-                    finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks());
-                    finPaymentrecordDto.setCostTypeKey("001");
-                    finPaymentrecordDto.setCostTypeValue("排产");
-                    //查询收款单位和收款账号
-                    List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
-                    String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();
-                    //根据车型sid查询账户名称和银行账号
-                    List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid);
-                    busApplyVo.removeAll(Collections.singleton(null));
-                    if (!busApplyVo.isEmpty()) {
-                        finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
-                        finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
-                    }
-                    finPaymentrecordDto.setBusSid(r.getData());
+                        finPaymentrecordDto.setCreateOrgSid(baseVehicleActualSales.getUseOrgSid());
+                        finPaymentrecordDto.setUseOrgSid(baseVehicleActualSales.getUseOrgSid());
+                        finPaymentrecordDto.setCost(Integer.valueOf(v.getPayAccount()));
+                        finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.CK_COSTTITLE.getCode());
+                        finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.CK_COSTTITLE.getRemarks());
+                        finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.MD_TYPE.getCode());
+                        finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.MD_TYPE.getRemarks());
+                        finPaymentrecordDto.setReceiveBankAccount(v.getReceivingAccount());
+                        finPaymentrecordDto.setReceiveCompany(v.getActualPay());
                         finPaymentrecordFeign.save(finPaymentrecordDto);
-                }*/
+                    }
+
+                }
             }
 
             return rb.success().setData(resultBean.getData());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -519,8 +519,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
                     finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode());
                     finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks());
-                    finPaymentrecordDto.setCostTypeKey("001");
-                    finPaymentrecordDto.setCostTypeValue("排产");
+                    finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());
+                    finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.CG_TYPE.getRemarks());
                     //查询收款单位和收款账号
                     List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
                     String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();