虚拟订单订金接口修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java

@@ -133,7 +133,7 @@ public interface BusMainDepositFeign {
 
     /************************************************************************************/
 
-    @ApiOperation("虚拟订单列表")
+    @ApiOperation("虚拟订单列表（新）")
     @PostMapping("/getVirtualOrders")
     public ResultBean<PagerVo<AppBusMainDepositVo>> getVirtualOrders(@RequestBody PagerQuery<AppBusMainDepositQuery> pagerQuery);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java

@@ -35,8 +35,21 @@ public interface BusDepositMapper extends BaseMapper<BusDeposit> {
     @Select("select * from bus_deposit where billSid=#{billSid}")
     BusDeposit selectByBillSid(@Param("billSid") String billSid);
 
+    /**
+     * 初始化虚拟订单订金收取（可修改/显示页）
+     *
+     * @param virtualOrderSid
+     * @param staffSid
+     * @return
+     */
     AppBusDepositBusDetailsVo depositDetail(@Param("virtualOrderSid") String virtualOrderSid, @Param("staffSid") String staffSid);
 
+    /**
+     * 虚拟订单订金收取详情（不可修改）
+     *
+     * @param virtualOrderSid
+     * @return
+     */
     AppBusDepositBuscenterDetailVo getDepositInfoDetails(@Param("virtualOrderSid") String virtualOrderSid);
 
     @Delete("delete from bus_deposit where billSid=#{billSid}")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@@ -4,6 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
+    <!--虚拟订单订金收取详情（不可修改）-->
     <select id="getDepositInfoDetails"
             resultType="com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo">
         SELECT billNo       AS virtualOrderId,
@@ -14,8 +15,10 @@
                deposit      AS deposit,
                paymentDate  AS payDate,
                payType      AS payTypeValue,
+               payTypeKey   AS payType,
                proBankAcc   AS collectionNumber,
                paymentProof,
+               createTime   AS createDate,
                remarks,
                staffName    AS sellerName,
                orgName      AS departmentName
@@ -32,7 +35,7 @@
                deposit      AS deposit,
                paymentDate  AS payDate,
                payType      AS payTypeValue,
-               payTypeKey   AS payType,
+               payTypeKey,
                proBankAcc   AS collectionNumber,
                paymentProof,
                remarks,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@@ -118,15 +118,14 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
      */
     public AppBusDepositBuscenterDetailVo getDepositInfoDetails(String virtualOrderSid) {
         AppBusDepositBuscenterDetailVo vo = baseMapper.getDepositInfoDetails(virtualOrderSid);
-        vo.setUpdateStateUrl("buscenter/v1/busmaindeposit/updateBusDepositMainNodeState");
         List<String> list = new ArrayList<>();
         String url = fileUploadComponent.getUrlPrefix() + vo.getPaymentProof();
         list.add(url);
         vo.setPayImages(list);
         List<AppBusDepositCustomerListVo> customerList = busDepositCustomerService.getAppListByBillSid(virtualOrderSid);
         for (AppBusDepositCustomerListVo appBusDepositCustomerListVo : customerList) {
-            appBusDepositCustomerListVo.setCustomerType(1);
+            String headImageUrl = fileUploadComponent.getUrlPrefix() + appBusDepositCustomerListVo.getHeadImage();
-            appBusDepositCustomerListVo.setHeadImage("http://192.168.1.110:8111/upload/20220208/1644315514338472_202202081818344362381.jpeg");
+            appBusDepositCustomerListVo.setHeadImage(headImageUrl);
         }
         if (customerList.size() < 0) {
             vo.setCustomerList(new ArrayList<>());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -58,7 +58,14 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
 
     List<BusMainDepositVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusMainDeposit> qw);
 
-    IPage<AppBusMainDepositVo> getVirtualOrders(IPage<AppBusMainDepositQuery> page, @Param("type") String type, @Param("staffSid") String staffSid, @Param("name") String name);
+    /**
+     * 虚拟订单列表（新）
+     *
+     * @param page
+     * @param qw
+     * @return
+     */
+    IPage<AppBusMainDepositVo> getVirtualOrders(IPage<AppBusMainDepositQuery> page, @Param(Constants.WRAPPER) Wrapper<AppBusMainDepositVo> qw);
 
     int selectCountByOrgSid(@Param("billsType") String billsType, @Param("date") String date, @Param("orgSid") String orgSid);
 
@@ -69,14 +76,16 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     int deleteVirtualOrder(@Param("staffSid") String staffSid, @Param("virtualOrderSid") String virtualOrderSid);
 
     BusMainDeposit selectBySid(@Param("virtualOrderSid") String virtualOrderSid);
+
     /**
      * 更新虚拟订单审批（订金）业务表中的流程状态
+     *
      * @param businessSid 业务sid
      * @param proDefId    流程定义sid
      * @param nodeState   环节状态
      * @param procInsId   流程实例sid
      * @param taskDefKey  环节sid
      */
-    void modifiBusDepositFlowState(@Param("businessSid") String businessSid,@Param("procDefId")  String procDefId,@Param("nodeState")  String nodeState,
+    void modifiBusDepositFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String procDefId, @Param("nodeState") String nodeState,
-                                   @Param("procInstSid")  String procInstSid,@Param("nodeSid")  String nodeSid);
+                                   @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -22,6 +22,7 @@
         <where>${ew.sqlSegment}</where>
     </select>
 
+    <!--虚拟订单列表-->
     <select id="getVirtualOrders" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo">
         SELECT bmd.sid AS virtualOrderSid,
         bmd.billNo AS virtualOrderId,
@@ -36,14 +37,7 @@
         FROM bus_main_deposit bmd
         LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
         LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
-        WHERE
+        <where>${ew.sqlSegment}</where>
-        bmd.staffSid = #{staffSid}
-        <if test="type != null and type != ''">
-            AND bmd.depositBillType = #{type}
-        </if>
-        <if test="name != null and name != ''">
-            AND bd.draweeName like CONCAT('%',#{name},'%')
-        </if>
     </select>
 
     <delete id="deleteVirtualOrder">
@@ -113,10 +107,12 @@
         FROM bus_main_deposit bmd
         WHERE bmd.sid = #{virtualOrderSid}
     </select>
-
-
     <update id="modifiBusDepositFlowState">
-       update bus_main_deposit set procDefId=#{procDefId},nodeState=#{nodeState},procInstSid=#{procInstSid},nodeSid=#{nodeSid}
+        update bus_main_deposit
-       where sid=#{businessSid}
+        set procDefId=#{procDefId},
+            nodeState=#{nodeState},
+            procInstSid=#{procInstSid},
+            nodeSid=#{nodeSid}
+        where sid = #{businessSid}
     </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java

@@ -171,6 +171,12 @@ public class BusMainDepositRest implements BusMainDepositFeign {
         return busMainDepositService.submitAppMainDespoitVehicleApprove(dto);
     }
 
+    /**
+     * 虚拟订单列表（新）
+     *
+     * @param pagerQuery
+     * @return
+     */
     @Override
     public ResultBean<PagerVo<AppBusMainDepositVo>> getVirtualOrders(PagerQuery<AppBusMainDepositQuery> pagerQuery) {
         PagerVo<AppBusMainDepositVo> page = new PagerVo<>();
@@ -182,9 +188,9 @@ public class BusMainDepositRest implements BusMainDepositFeign {
 
     @Override
     public ResultBean saveDepositInfo(AppBusDepositBuscenterDto dto) {
-        if (dto.getPayImages() != null && dto.getPayImages().size() > 1) {
+//        if (dto.getPayImages() != null && dto.getPayImages().size() > 1) {
-            return new ResultBean().fail().setMsg("只可上传一张付款凭证");
+//            return new ResultBean().fail().setMsg("只可上传一张付款凭证");
-        }
+//        }
         return busMainDepositService.saveDepositInfo(dto);
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -196,15 +196,16 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     @Transactional(rollbackFor = Exception.class)
     public ResultBean saveOrUpdateDeposit(BusDepositDto dto) {
-        if(StringUtils.isBlank(dto.getSid())){
+        if (StringUtils.isBlank(dto.getSid())) {
             return saveFictitiousDeposit(dto);
-        }else{
+        } else {
-            return updateDeposit(dto,dto.getSid());
+            return updateDeposit(dto, dto.getSid());
         }
     }
 
     /**
      * 新增订金类型的虚拟订单
+     *
      * @param dto
      * @return
      */
@@ -556,18 +557,18 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     }
 
     /**
-     * 虚拟定单列表查询接口
+     * 虚拟定单列表查询接口（新）
      *
      * @param pagerQuery
      * @return
      */
     public IPage<AppBusMainDepositVo> getVirtualOrders(PagerQuery<AppBusMainDepositQuery> pagerQuery) {
         IPage<AppBusMainDepositQuery> page = PagerUtil.queryToPage(pagerQuery);
-        String type = pagerQuery.getParams().getType();
-        String name = pagerQuery.getParams().getName();
         ResultBean<AppUserOrgInfoVo> userOrgInfoByUser = sysUserFeign.getUserOrgInfoByUserSid(pagerQuery.getParams().getUserSid());
         String staffSid = userOrgInfoByUser.getData().getStaffSid();
-        IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, type, staffSid, name);
+        pagerQuery.getParams().setStaffSid(staffSid);
+        QueryWrapper<AppBusMainDepositVo> qw = aaQueryWrapper(pagerQuery.getParams());
+        IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw);
         for (AppBusMainDepositVo record : iPage.getRecords()) {
             record.setDescribe("订金: 50.000.00元 已用: 0元");
             ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(record.getVirtualOrderSid());
@@ -590,6 +591,26 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return iPage;
     }
 
+    /**
+     * 虚拟订单列表查询条件（新）
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<AppBusMainDepositVo> aaQueryWrapper(AppBusMainDepositQuery query) {
+        QueryWrapper<AppBusMainDepositVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getStaffSid())) {
+            qw.eq("bmd.staffSid", query.getStaffSid());
+        }
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("bd.draweeName", query.getName()).or().like("bdv.customerName", query.getName()));
+        }
+        if (StringUtils.isNotBlank(query.getType())) {
+            qw.eq("bmd.depositBillType", query.getType());
+        }
+        return qw;
+    }
+
     /**
      * 新增/修改订金收取单
      *
@@ -597,10 +618,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean saveDepositInfo(AppBusDepositBuscenterDto dto) {
+    public ResultBean
+    saveDepositInfo(AppBusDepositBuscenterDto dto) {
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
         Date date = new Date();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        //判断订单sid是否有值(无值 新增 有值 修改)
         if (StringUtils.isBlank(dto.getVirtualOrderSid())) { //新增
             BusMainDeposit busMainDeposit = new BusMainDeposit();
             busMainDeposit.setSid(UUID.randomUUID().toString());
@@ -611,6 +634,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setDepositBillType("01");
             busMainDeposit.setDepositBillTypeKey("订金收取");
             busMainDeposit.setCreateDate(dateFormat.format(date));
+            busMainDeposit.setProcDefId(dto.getTaskId());
+            busMainDeposit.setProcInstSid(dto.getProcInsId());
             baseMapper.insert(busMainDeposit);
             BusDeposit busDeposit = new BusDeposit();
             busDeposit.setBillNo(busMainDeposit.getBillNo());
@@ -625,8 +650,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             appSetBusDepositCustomer(dto, busDeposit);
             return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("添加成功");
         } else { //修改
-            BusMainDeposit busMainDeposit = baseMapper.selectBySid(dto.getVirtualOrderSid());
+            Integer flowState = sysFormLinkFeign.selectStateByBusinessSid(dto.getVirtualOrderSid()).getData().getFlowState();
-//            if (StringUtils.isBlank(busMainDeposit.getNodeState())) {
+            if (flowState == 0 || flowState == -1) { //判断订单状态是否是未提交和拨回到发起人状态
                 BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid());
                 //付款凭证
                 busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages()));
@@ -636,8 +661,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid());
                 appSetBusDepositCustomer(dto, busDeposit);
                 return new ResultBean().success().setMsg("修改成功");
-//            }
+            }
-//            return new ResultBean().fail().setMsg("修改失败");
+            return new ResultBean().fail().setMsg("已提交办理审批中不可修改!");
         }
     }
 
@@ -651,7 +676,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public BusDeposit setBusDeposit(BusDeposit busDeposit, AppBusDepositBuscenterDto dto) {
         busDeposit.setDraweeName(dto.getPayName());
         busDeposit.setProBankAcc(dto.getCollectionNumber());
-        busDeposit.setPayTypeKey(dto.getPayType());
+        busDeposit.setPayTypeKey(dto.getPayTypeKey());
         busDeposit.setPayType(dto.getPayTypeValue());
         busDeposit.setPaymentDate(dto.getPayDate());
         busDeposit.setVehicleNum(dto.getCarNumber());
@@ -727,12 +752,13 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         return resultBean;
     }
+
     private void modifiBusMainDepositFlowState(String businessSid,
                                                String proDefId,//procDefId
                                                String nodeState,//state
                                                String procInsId,//procInstSid
                                                String taskDefKey//nodeSid
-     ){
+    ) {
         baseMapper.modifiBusDepositFlowState(businessSid,
                 proDefId,//procDefId
                 nodeState,//state