添加更新付款状态的方法

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufUpdateDto.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.base.api.basemanufactorsubscription;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/27 20:40
+ * @Description
+ */
+@Data
+public class BaseManufUpdateDto implements Dto {
+    private static final long serialVersionUID = -2909465832730619504L;
+    @ApiModelProperty(value = "厂家认款sid")
+    private String sid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java

@@ -64,25 +64,13 @@ public interface BaseManufactorSubscriptionFeign {
     @PostMapping("/save")
     public ResultBean save(@RequestBody BaseManufactorSubscriptionDto dto);
 
-    /* @ApiOperation("修改保存")
-     @PostMapping("/update/{sid}")
-     public ResultBean update(@RequestBody BaseManufactorSubscriptionDto dto, @PathVariable("sid") String sid);
- */
-   /* @ApiOperation("厂家认款通过")
-    @PostMapping("/adopt/{sid}/{remarks}")
-    public ResultBean adopt(@PathVariable("sid") String sid, @PathVariable("remarks") String remarks);*/
-
     @ApiOperation("厂家认款通过")
     @PostMapping("/adopt")
     public ResultBean adopt(@RequestBody BaseManufactorDto dto);
 
-   /* @ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids);
-
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<BaseManufactorSubscriptionVo> fetchBySid(@PathVariable("sid") String sid);*/
+    @ApiOperation("更新厂家认款的付款状态")
+    @PostMapping("/updatePaymentState")
+    public ResultBean updatePaymentState(@RequestBody BaseManufUpdateDto dto);
 
     /**
      * 厂商认款见证材料上传

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java

@@ -63,6 +63,11 @@ public class BaseManufactorSubscriptionFeignFallback implements BaseManufactorSu
         return null;
     }
 
+    @Override
+    public ResultBean updatePaymentState(BaseManufUpdateDto dto) {
+        return null;
+    }
+
    /* @Override
     public ResultBean update(BaseManufactorSubscriptionDto dto, String sid) {
         return ResultBean.fireFail().setMsg("接口manufactor_subscription/basemanufactorsubscription/update无法访问");

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplysz/BusVehicleApplySzVo.java

@@ -20,14 +20,21 @@ public class BusVehicleApplySzVo implements Vo {
     private String refitMethod;
     @ApiModelProperty(value = "委改厂")
     private String refitFactory;
-    @ApiModelProperty(value = "外廓尺寸")
-    private String overallDimension;
+    @ApiModelProperty(value = "外廓尺寸:长")
+    private String wkLong;
+    @ApiModelProperty(value = "外廓尺寸：宽")
+    private String wkWide;
+    @ApiModelProperty(value = "外廓尺寸：高")
+    private String wkHigh;
     @ApiModelProperty(value = "颜色")
     private String color;
     @ApiModelProperty(value = "板材材质")
     private String plateMaterial;
-    @ApiModelProperty(value = "板材厚度")
-    private String plateThickness;
+    @ApiModelProperty(value = "板材厚度:底")
+    private String plateThicknessBottom;
+    @ApiModelProperty(value = "板材厚度：边")
+    private String plateThicknessEdge;
+
     @ApiModelProperty(value = "篷布滑道")
     private String tarpaulinSlide;
     @ApiModelProperty(value = "冷藏冷机")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.java

@@ -71,4 +71,6 @@ public interface BaseManufactorSubscriptionMapper extends BaseMapper<BaseManufac
 
     @Update("update base_manufactor_subscription set witMatUrl = #{filePath} where sid = #{sid}")
     int updateWitMatUrl(@Param("filePath") String filePath, @Param("sid") String sid);
+
+    int updatePaymentState(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml

@@ -30,4 +30,10 @@
         </if>
         where sid = #{sid}
     </update>
+
+    <update id="updatePaymentState">
+        update base_manufactor_subscription
+        set paymentState = 1
+        where sid = #{sid}
+    </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java

@@ -87,6 +87,11 @@ public class BaseManufactorSubscriptionRest implements BaseManufactorSubscriptio
         return baseManufactorSubscriptionService.adopt(dto);
     }
 
+    @Override
+    public ResultBean updatePaymentState(BaseManufUpdateDto dto) {
+        return baseManufactorSubscriptionService.updatePaymentState(dto);
+    }
+
 	/*@Override
 	@ApiOperation("修改保存")
 	@PostMapping("/update/{sid}")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -187,12 +187,12 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         return baseMapper.updateWitMatUrl(filePath, sid);
     }
 
-    public ResultBean saveDto(BaseManufactorSubscriptionDto dto) {
-        ResultBean rb = ResultBean.fireFail();
+    public ResultBean<String> saveDto(BaseManufactorSubscriptionDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
         BaseManufactorSubscription baseManufactorSubscription = new BaseManufactorSubscription();
         BeanUtil.copyProperties(dto, baseManufactorSubscription, "sid");
         baseMapper.insert(baseManufactorSubscription);
-        return rb.success();
+        return rb.success().setData(baseManufactorSubscription.getSid());
     }
 
     public ResultBean adopt(BaseManufactorDto dto) {
@@ -243,4 +243,11 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         }
         return rb.success().setMsg("操作成功");
     }
+
+    public ResultBean updatePaymentState(BaseManufUpdateDto dto) {
+        ResultBean resultBean = ResultBean.fireFail();
+        String sid = dto.getSid();
+        int i = baseMapper.updatePaymentState(sid);
+        return resultBean.success();
+    }
 }

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

@@ -48,7 +48,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -416,14 +415,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 //判断申请的订金
                 List<BusVehicleApplyDetailVo> vo = busVehicleApplyDetailService.fetchByApplySid(bv.getBusinessSid());
                 vo.removeAll(Collections.singleton(null));
-                BigDecimal bigDecimal = new BigDecimal("0");
-                for (BusVehicleApplyDetailVo o : vo) {
-                    String applyForDeposit = o.getApplyForDeposit();
-                    if (StringUtils.isNotBlank(applyForDeposit)) {
-                        bigDecimal = bigDecimal.add(new BigDecimal(applyForDeposit));
-                    }
-                }
-                if (bigDecimal.compareTo(new BigDecimal("0")) == 1) {
+                if (busVehicleApply.getCurrentAmount() > 0) {
                     //未打款、未认款的厂家认款记录
                     baseManufactorSubscriptionDto.setState(0);//未认款
                     baseManufactorSubscriptionDto.setPaymentState("0");//未打款
@@ -435,33 +427,37 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(busVehicleApply.getCreateBySid());
                 baseManufactorSubscriptionDto.setCreateOrgSid(stringResultBean.getData());
                 baseManufactorSubscriptionDto.setUseOrgSid(stringResultBean.getData());
-                baseManufactorSubscriptionDto.setPaymentMoney(bigDecimal.toString());//打款金额
+                baseManufactorSubscriptionDto.setPaymentMoney(busVehicleApply.getCurrentAmount().toString());//打款金额
                 baseManufactorSubscriptionDto.setProSchAppNo(busVehicleApply.getApplicationCode());//排产申请编号
-                ResultBean r = baseManufactorSubscriptionService.saveDto(baseManufactorSubscriptionDto);
+                ResultBean<String> r = baseManufactorSubscriptionService.saveDto(baseManufactorSubscriptionDto);
 
                 //推送到财务出纳
-                FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
-                finPaymentrecordDto.setApplySid(busVehicleApply.getSid());
-                finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid());
-                finPaymentrecordDto.setPayType(1);
-                finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
-                finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
-                finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
-                finPaymentrecordDto.setCostTitleKey("1");
-                finPaymentrecordDto.setCostTitleValue("车款");
-                finPaymentrecordDto.setCostTypeKey("2");
-                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());
+                if (busVehicleApply.getCurrentAmount() > 0) {
+                    FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                    finPaymentrecordDto.setApplySid(busVehicleApply.getSid());
+                    finPaymentrecordDto.setPayCompanySid(busVehicleApply.getCreateOrgSid());
+                    finPaymentrecordDto.setPayType(1);
+                    finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
+                    finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
+                    finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
+                    finPaymentrecordDto.setCostTitleKey("1");
+                    finPaymentrecordDto.setCostTitleValue("车款");
+                    finPaymentrecordDto.setCostTypeKey("2");
+                    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());
+                    finPaymentrecordFeign.save(finPaymentrecordDto);
                 }
-                finPaymentrecordFeign.save(finPaymentrecordDto);
+
             }
             return rb.success().setData(resultBean.getData());
         } else {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplysz/BusVehicleApplySzMapper.xml

@@ -8,24 +8,26 @@
     </delete>
 
     <select id="selectByDetails" resultType="com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySzVo">
-        select sz.vehicleFunction,
-               sz.topName,
-               sz.refitMethod,
+        select sz.vehicleTypeValue   vehicleFunction,
+               sz.installNameValue   topName,
+               sz.refitMethodValue   refitMethod,
                sz.refitFactory,
-               sz.overallDimension,
-               sz.plateMaterial,
-               sz.plateThickness,
-               sz.otherConfig,
+               sz.wk_high,
+               sz.wk_wide,
+               sz.wk_long,
+               sz.plateMaterialValue plateMaterial,
+               sz.plateThicknessBottom,
+               sz.moreConfig         otherConfig,
                bva.guidePrice,
                bva.costPrice,
-               sz.color,
+               sz.colorValue         color,
                sz.tarpaulinSlide,
                sz.refrigerator,
-               sz.coverPlate,
+               sz.selfUnHyCoPl       coverPlate,
                sz.floorHeating,
-               sz.sid szSid
+               sz.sid                szSid
         from bus_vehicle_apply_sz bva
-                 left join base_model_szconfig sz on sz.sid = bva.szSid
+                 left join base_vehinstallmodel sz on sz.sid = bva.szSid
         where bva.detailsSid = #{sid}
     </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finpaymentrecord;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufUpdateDto;
+import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionFeign;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
@@ -65,6 +67,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private FinPaymentapplyService finPaymentapplyService;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private BaseManufactorSubscriptionFeign baseManufactorSubscriptionFeign;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -121,7 +125,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             }
         }
         if (applySids.contains("")) {
-            return rb.setMsg("批量处理的数据中包含收款账号不存在的数据");
+            return rb.setMsg("处理的数据包含收款账号不存在的数据");
         }
         List<String> list = new ArrayList<>();
         for (int i = 0; i < sids.size(); i++) {
@@ -135,6 +139,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 baseMapper.updateStateBySid(finPaymentrecord.getSid(), 2);
             } else {
                 baseMapper.updateStateBySid(finPaymentrecord.getSid(), 2);
+                //更新厂家认款状态
+                BaseManufUpdateDto baseManufUpdateDto = new BaseManufUpdateDto();
+                baseManufUpdateDto.setSid(finPaymentrecord.getBusSid());
+                ResultBean resultBean = baseManufactorSubscriptionFeign.updatePaymentState(baseManufUpdateDto);
             }
 
         }