修改问题及优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -279,7 +279,7 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean<String> selectTemporaryNo(@RequestParam("vehSid")String vehSid);
 
-    @ApiOperation(value = "根据车辆sid查询销售订单是否存在，若存在返回相关数据")
+    @ApiOperation(value = "出库初始化，根据车辆sid查询销售订单是否存在，若存在返回相关数据")
     @GetMapping("/selectOrderOne")
     @ResponseBody
     ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(@RequestParam("vinSid")String vinSid);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java

@@ -17,8 +17,54 @@ public class BusSalesOrderConstantUtils {
      */
     public static String GENERAL_MANAGER_ROLESID = "135b4829-2928-4124-a5b3-7d4b1101a863";
 
+
     /**
-     * 车辆临时状态
+     * 流程中网关参数
+     * 是否是全款：IS_LOAN
+     * 销售部经理是否超权限：SALES_MANAGER_Price true超权限，false不超权限
+     * 总经理是否超权限：GENERAL_MANAGER_PRICE true超权限，false不超权限
+     */
+    public static String IS_LOAN = "isLoan";
+    public static String SALES_MANAGER_Price = "isPrice";
+    public static String GENERAL_MANAGER_PRICE = "isPrice1";
+
+    /**
+     * 付款类型
+     */
+    @Getter
+    public static enum PayTypeEnum {
+        /**
+         * 全款
+         */
+        FULL_PAYMENT("1", "全款"),
+        /**
+         * 贷款
+         */
+        LOAN("2", "贷款");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private PayTypeEnum(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 车辆类型
      */
     @Getter
     public static enum TypeEnum {
@@ -55,4 +101,162 @@ public class BusSalesOrderConstantUtils {
             this.remarks = remarks;
         }
     }
+
+    /**
+     * 是否包含上装
+     */
+    @Getter
+    public static enum TopType {
+        /**
+         * 包含上装
+         */
+        YES("1", "包含"),
+        /**
+         * 不包含上装
+         */
+        NO("0", "不包含");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private TopType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 订金交纳方式
+     */
+    @Getter
+    public static enum DepositType {
+        /**
+         * 现交订金
+         */
+        CASH_DEPOSIT("01", "现交订金"),
+        /**
+         * 订金结转
+         */
+        DEPOSIT_CARRY_FORWARD("02", "订金结转");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private DepositType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 是否包含保险
+     */
+    @Getter
+    public static enum InsuranceType {
+        /**
+         * 包含保险
+         */
+        YES("1", "入保"),
+        /**
+         * 不包含保险
+         */
+        NO("0", "不入保");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private InsuranceType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    /**
+     * 载货、自卸、搅拌车、专用车有上装、牵引车、起重机没有上装的
+     */
+    @Getter
+    public static enum VehicleFunctions {
+        /**
+         * 搅拌车
+         */
+        MIXER("7", "搅拌车"),
+        /**
+         * 载货车
+         */
+        TRUCK("005", "载货车"),
+        /**
+         * 牵引车
+         */
+        TRACTION("4", "牵引车"),
+        /**
+         * 专用车/特种车
+         */
+        SPECIAL("5", "专用车/特种车"),
+        /**
+         * 自卸车
+         */
+        DUMP("3", "自卸车"),
+        /**
+         * 起重机
+         */
+        CRANCE("6", "起重机");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private VehicleFunctions(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -38,6 +38,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDeta
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.*;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
@@ -203,7 +204,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         //先计算需补交订金是多少
         //总的结转金额
         BigDecimal makeUpDecimal = new BigDecimal("0");
-        if ("02".equals(dto.getDepositTypeKey())) {
+        if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {
             List<AppBusSalesOrderDepositListDto> listVos = dto.getVirtualOrderList();
             listVos.removeAll(Collections.singleton(null));
             if (!listVos.isEmpty()) {
@@ -262,7 +263,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             BeanUtil.copyProperties(dto, busSalesOrderDeposit, "sid");
             //计算需补交订金
             if (StringUtils.isNotBlank(dto.getDepositAll())) {
-                if ("02".equals(dto.getDepositTypeKey())) {
+                if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {
                     BigDecimal bigDecimalAll = new BigDecimal(dto.getDepositAll());
                     busSalesOrderDeposit.setMakeUpDeposit(bigDecimalAll.subtract(makeUpDecimal));
                 }
@@ -274,13 +275,13 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             BeanUtil.copyProperties(dto, busSalesOrderDeposit, "sid");
             //计算需补交订金
             if (StringUtils.isNotBlank(dto.getDepositAll())) {
-                if ("02".equals(dto.getDepositTypeKey())) {
+                if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {
                     BigDecimal bigDecimalAll = new BigDecimal(dto.getDepositAll());
                     busSalesOrderDeposit.setMakeUpDeposit(bigDecimalAll.subtract(makeUpDecimal));
                 }
             }
             baseMapper.updateById(busSalesOrderDeposit);
-            if ("01".equals(dto.getDepositTypeKey())) {
+            if (BusSalesOrderConstantUtils.DepositType.CASH_DEPOSIT.getCode().equals(dto.getDepositTypeKey())) {
                 //将需补交订金设置为null
                 baseMapper.updateMakeUpDeposit(depositSid);
 
@@ -305,7 +306,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             busDepositFictitiousService.deleteByDepositSid(depositSid);
         }
         //若缴纳方式为订金结转
-        if ("02".equals(dto.getDepositTypeKey())) {
+        if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(dto.getDepositTypeKey())) {
             List<AppBusSalesOrderDepositListDto> listVos = dto.getVirtualOrderList();
             listVos.removeAll(Collections.singleton(null));
             BigDecimal bigDecimalAll = new BigDecimal("0");