移动端销售订单问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@@ -117,4 +117,9 @@ public interface BusVehicleOrderFeign {
     @ApiOperation("查询采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路")
     @GetMapping("/getActualAndOrgDept/{vehicleOrderSid}/{modelSid}/{configSid}")
     public  ResultBean<ActualAndOrgDeptVo> getActualAndOrgDept(@PathVariable("vehicleOrderSid") String vehicleOrderSid, @PathVariable("modelSid")String modelSid, @PathVariable("configSid")String configSid);
+
+    @ApiOperation("根据采购订单sid更新采购订单的锁定数量")
+    @PutMapping("/updateState")
+    ResultBean updateLockNum(@RequestParam("sid")String sid,@RequestParam("num")String num);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@@ -112,5 +112,10 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean updateLockNum(String sid, String num) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo;
 import com.yxt.anrui.base.api.busvehicleorder.*;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -116,4 +117,6 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
 
     @Update("update bus_vehicle_order set state = 1 where sid = #{vehicleOrderSid}")
     void updateState(String vehicleOrderSid);
+
+    int updateLockNum(@Param("sid") String sid, @Param("num") String num);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -211,4 +211,8 @@
                         ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
         WHERE bvad.sid = #{sid}
     </select>
+
+    <update id="updateLockNum">
+        update bus_vehicle_order set lockingNum = #{num} where sid = #{sid}
+    </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -218,4 +218,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean updateLockNum(String sid, String num) {
+        return busVehicleOrderService.updateLockNum(sid,num);
+    }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -525,4 +525,10 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         baseMapper.updateState(vehicleOrderSid);
         return rb.success().setMsg("更新成功");
     }
+
+    public ResultBean updateLockNum(String sid, String num) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateLockNum(sid,num);
+        return rb.success();
+    }
 }

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

@@ -658,46 +658,38 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 AppBusDepositBusDetailsVo vo = baseMapper.selDepositByBillsid(virtualOrderSid);
                 record.setPayName(vo.getPayName());
                 record.setMobile(vo.getMobile());
-                if (StringUtils.isNotBlank(record.getUsedDeposit())) {
-                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + record.getUsedDeposit() + "元");
-                } else {
-                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
-                }
-                /*List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId());
-                if (depositRecords.size() > 0) {
-                    for (BusDepositRecordsVo depositRecord : depositRecords) {
-                        String usePrice = depositRecord.getUsePrice();
-                        if (StringUtils.isNotBlank(usePrice)) {
-                            BigDecimal priceBig = new BigDecimal(usePrice);
-                            bigDecimalAll = bigDecimalAll.add(priceBig);
-                        }
-                    }
-                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + bigDecimalAll.toString() + "元");
-                } else {
-                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
-                }*/
-                record.setCarNumber(vo.getCarNumber());
-                //财务确认状态字段
-                if("已办结".equals(record.getVirtualOrderState())){
+                //判断财务是否已审核
+                if ("已办结".equals(record.getVirtualOrderState())) {
                     //查询款项确认的busSid是否存在该申请的sid
                     ResultBean<FinCollectionConfirmation> finCollectionConfirmationResultBean = finCollectionConfirmationFeign.selectByBusSid(record.getVirtualOrderSid());
                     //审核状态（1待审核/2已驳回/3已审核）
                     FinCollectionConfirmation finCollectionConfirmation = finCollectionConfirmationResultBean.getData();
-                    if(finCollectionConfirmation != null){
-                        if("1".equals(finCollectionConfirmation.getAuditState())){
-                            record.setPaymentState("待确认");
-                        }else if("2".equals(finCollectionConfirmation.getAuditState())){
-                            record.setPaymentState("驳回");
+                    if (finCollectionConfirmation != null) {
+                        if(finCollectionConfirmation.getAuditState() != null){
+                            if(finCollectionConfirmation.getAuditState() ==1){
+                                record.setPaymentState("待确认");
+                            }else if(finCollectionConfirmation.getAuditState() ==2){
+                                record.setPaymentState("驳回");
+                            }else{
+                                record.setPaymentState("已确认");
+                                if (StringUtils.isNotBlank(record.getUsedDeposit())) {
+                                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + record.getUsedDeposit() + "元");
+                                } else {
+                                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
+                                }
+                            }
+
                         }else{
-                            record.setPaymentState("已确认");
+                            record.setPaymentState("待确认");
                         }
                     }
                 }
+                record.setCarNumber(vo.getCarNumber());
             } else if (record.getVirtualOrderType().equals("02")) {
                 BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);
                 int count = baseMapper.selByBillSidCount(virtualOrderSid);
                 record.setCarNumber(String.valueOf(count));
-                if(busDepositVehicleCustomer != null){
+                if (busDepositVehicleCustomer != null) {
                     record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
                     record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
                     record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
@@ -1910,7 +1902,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     public ResultBean submitVirtualVehicleOrder(SubmitVirtualOrderVehicleDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if(StringUtils.isBlank(dto.getCustomerSid())){
+        if (StringUtils.isBlank(dto.getCustomerSid())) {
             return rb.setMsg("客户不能为空");
         }
         //根据用户sid获取staffSid
@@ -1948,9 +1940,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
 //                return rb.setMsg("您所选车辆已被预定或锁定!");
             }
         }
-        if(isLock){
-            String vinNos = String.join(",",stringList);
-            return rb.setMsg("您所选车辆："+vinNos+"已被预定或锁定");
+        if (isLock) {
+            String vinNos = String.join(",", stringList);
+            return rb.setMsg("您所选车辆：" + vinNos + "已被预定或锁定");
         }
         //新增修改保存
         ResultBean<String> resultBean = reserveCarInfo(dto);
@@ -2138,7 +2130,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     List<String> orgList = Arrays.asList(bv.getOrgSidPath().split("/"));
                     String deptSid = orgList.get(orgList.size() - 1);
                     ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid);
-                    if(sysOrganizationVoResultBean.getData() != null){
+                    if (sysOrganizationVoResultBean.getData() != null) {
                         finConfirmDto.setCreateDept(sysOrganizationVoResultBean.getData().getName());
                     }
                     //申请日期

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -129,7 +129,9 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -241,6 +243,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BaseDiscountpackageFeign baseDiscountpackageFeign;
     @Autowired
     private BaseBrandletpricepowimitFeign baseBrandletpricepowimitFeign;
+    @Autowired
+    private SysUserRoleFeign sysUserRoleFeign;
 
 
     /**
@@ -2778,6 +2782,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
+        BusSalesOrder busSalesOrderOne = fetchBySid(businessSid);
+        if("2".equals(busSalesOrderOne.getType())){
+            List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid());
+            for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list){
+                String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
+                //查询该采购订单的已使用台数
+                int count = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+                //更新该采购订单的锁定台数
+                ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid,String.valueOf(count));
+            }
+
+        }
         //保存提交时补充的内容
         BusSalesOrderSubmitDto busSalesOrderSubmit = dto.getInfo();
         if (busSalesOrderSubmit != null) {
@@ -2806,6 +2822,30 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         bv.setFormVariables(variables);
         //流程定义id
         bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+        //根据员工的sid查询员工的角色
+        String userSid = busSalesOrderOne.getCreateBySid();
+        ResultBean<List<String>> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid);
+        UserRoleQuery userRoleQuery = new UserRoleQuery();
+        if (userRoleList.getData().size() > 0) {
+            userRoleQuery.setRoleSid(userRoleList.getData().get(0));
+        }
+        userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid());
+        ResultBean<List<SysUserVo>> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery);
+        if (!listResultBean.getSuccess()) {
+            return rb.setMsg(listResultBean.getMsg());
+        }
+        List<SysUserVo> sysUserVos = listResultBean.getData();
+        sysUserVos.removeAll(Collections.singleton(null));
+        if (sysUserVos.isEmpty()) {
+            return rb.setMsg("下一环节没有用户");
+        }
+        StringBuilder nextNodeUserSids = new StringBuilder();
+        for (SysUserVo su : sysUserVos) {
+            nextNodeUserSids.append(su.getSid()).append(",");
+        }
+        //符合条件的用户的sid,拼接的字符串
+        String nextNodeUserSids_ = nextNodeUserSids.toString();
+        bv.setNextNodeUserSids(nextNodeUserSids_);
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -195,13 +195,13 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
         String type = "";
         String state = dto.getState();
         int num = 0;
-        if ("0".equals(state)) {
+        if ("0".equals(state)) {//现车
             type = "1";
             List<AppBusSalesOrderVehicleDto> nowCarList = orderInfo.getNowCarList();
             busSalesOrderVehicleService.saveAppVehicle(nowCarList, salesOrderSid);
             num = nowCarList.size();
         }
-        if ("1".equals(state)) {
+        if ("1".equals(state)) {//采购订单
             List<AppBusSalesVehicleOrderDto> readyCarList = orderInfo.getReadyCarList();
             busSalesVehicleOrderService.saveAppOrder(readyCarList, salesOrderSid);
             type = "2";

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java

@@ -79,4 +79,6 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
      * @return
      */
     List<String> selectListBySid(String sid);
+
+    int selectByLinkSid(String linkSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -47,4 +47,8 @@
         from bus_sales_vehicle_order
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="selectByLinkSid" resultType="int">
+        select sum(usingNum) from bus_sales_vehicle_order where linkSid = #{linkSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -119,4 +119,8 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
     public List<String> selectList(String sid) {
         return baseMapper.selectListBySid(sid);
     }
+
+    public int selectByLinkSid(String linkSid) {
+        return baseMapper.selectByLinkSid(linkSid);
+    }
 }