std静态变量替换

src/main/java/com/dk/mdm/service/mst/DictionaryDataService.java

@@ -115,7 +115,7 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
         dictionaryData.setDataCode(uniqueNoteCode.get("outNote").toString());
 
         // 标准版账户类别新建要在资金账户表里插入一条一样的，编辑时两个表一起更新；专业版逻辑不变
-        if (dictionaryDataVO.getDictCode().equals("基础资料-账户") && dictionaryDataVO.getGradeCode() != null && dictionaryDataVO.getGradeCode().equals("STD")) {
+        if (dictionaryDataVO.getDictCode().equals("基础资料-账户") && dictionaryDataVO.getGradeCode() != null && dictionaryDataVO.getGradeCode().equals(Constant.GradeCode.STD.getName())) {
             //新建资金账户
             String staffId = authUtils.getStaff().getStaffId();
             moneyAccountService.insert(new MoneyAccountVO().setAccDate(LocalDate.now())
@@ -155,7 +155,7 @@ public class DictionaryDataService extends BaseService<DictionaryData> {
             dictionaryDataMapper.updateFlgDefault(new DictionaryDataQuery().setCpId(dictionaryData1.getCpId()).setDictCode(dictionaryData1.getDictCode()));
         }
 
-        if (dictionaryDataVO.getDictCode().equals("基础资料-账户") && dictionaryDataVO.getGradeCode() != null && dictionaryDataVO.getGradeCode().equals("STD")) {
+        if (dictionaryDataVO.getDictCode().equals("基础资料-账户") && dictionaryDataVO.getGradeCode() != null && dictionaryDataVO.getGradeCode().equals(Constant.GradeCode.STD.getName())) {
             //编辑资金账户
             ResponseResultVO<PageList<MoneyAccountResponse>> pageListResponseResultVO = moneyAccountService.selectByCond(new MoneyAccountQuery().setMacType(dictionaryDataVO.getDataId()).setCpId(authUtils.getStaff().getCpId()));
             if(pageListResponseResultVO.getData().getList() != null && pageListResponseResultVO.getData().getList().size() > 0){

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -545,7 +545,7 @@ public class OrderService extends BaseService<Order> {
                 for (OrderItemVO orderItemVO : deleteOrderItemVOList) {
                     orderItemForUpdate = orderItemMapper.selectByIdForUpdate(orderItemVO.getItemId());
                     //当gradeCode为"STD"时，无论outStatus是什么，都直接删除；而当gradeCode不是"STD"时，只有outStatus为DAICHUKU时才允许删除
-                    if ("STD".equals(gradeCode) ||
+                    if (Constant.GradeCode.STD.getName().equals(gradeCode) ||
                             (Constant.OutStatus.DAICHUKU.getName().equals(orderItemForUpdate.getOutStatus()))) {
                         orderItemMapper.deleteById(orderItemVO.getItemId());
                     } else {
@@ -561,7 +561,7 @@ public class OrderService extends BaseService<Order> {
             orderItemForUpdate = orderItemMapper.selectByIdForUpdate(orderItemVO.getItemId());
             // 出库数量
             BigDecimal outintOrOutQty = orderItemForUpdate.getOutingQty().add(orderItemForUpdate.getOutQty());
-            if (!"STD".equals(gradeCode)) {
+            if (!Constant.GradeCode.STD.getName().equals(gradeCode)) {
                 // 商品数量不能小于（出库中数量+已出库数量）
                 if (orderItemVO.getItemQty().compareTo(outintOrOutQty) == -1) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ITEMQTY_NO_LESS_OUTQTY.getMessage());
@@ -739,7 +739,7 @@ public class OrderService extends BaseService<Order> {
                 // 更新总账表的锁定金额
                 accountService.updateReceiptLock(recPayForUpdate.getObjectId());
             }
-        } else if ("STD".equals(gradeCode)) {
+        } else if (Constant.GradeCode.STD.getName().equals(gradeCode)) {
             if (orderVO.getReceiptList() != null && orderVO.getReceiptList().size() > 0) {
                 // 计算订单明细的出库中数量，金额合计
                 RecPayItemVO itemSum = orderVO.getReceiptList().stream().reduce((x, y) -> {
@@ -816,7 +816,7 @@ public class OrderService extends BaseService<Order> {
             accountService.updateMac(macId);
         }
         /**************************************** 客户收款end ********************************/
-        if ("STD".equals(gradeCode)) { //订单 转 出库数据
+        if (Constant.GradeCode.STD.getName().equals(gradeCode)) { //订单 转 出库数据
             // 合并两个列表
             List<OrderItemVO> combinedList = Stream.concat(insertOrderItemVOList.stream(), editOrderItemVOList.stream())
                     .collect(Collectors.toList());
@@ -1099,7 +1099,7 @@ public class OrderService extends BaseService<Order> {
 
             String gradeCode = authUtils.getStaff().getGradeCode();
             // 更新总账表的总收款额和可用额
-            if ("STD".equals(gradeCode)) {
+            if (Constant.GradeCode.STD.getName().equals(gradeCode)) {
                 accountService.updateReceipt(recPayForUpdate.getObjectId());
             } else {
                 accountService.updateReceiptLock(recPayForUpdate.getObjectId());