Просмотр исходного кода

仓库额度和小分仓额度

mac 2 лет назад
Родитель
Сommit
2ab7bc1612

+ 34 - 0
kxs-transfer/src/main/java/com/kxs/transfer/api/service/store/impl/KxsWarehouseServiceImpl.java

@@ -261,6 +261,8 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
     public void changeAccountData(DMLData dmlData) {
     public void changeAccountData(DMLData dmlData) {
         //修改的字段值
         //修改的字段值
         Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
         Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //全部字段值
+        Map<String, FieldData> fieldDataMap = dmlData.getFieldDataMap();
         //修改的字段
         //修改的字段
         List<String> changeFieldList = dmlData.getChangeFieldList();
         List<String> changeFieldList = dmlData.getChangeFieldList();
         //操作的主键
         //操作的主键
@@ -294,6 +296,21 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
             }
             }
         }
         }
         if (BeanUtil.isNotEmpty(warehouseLimit, "entityClass")) {
         if (BeanUtil.isNotEmpty(warehouseLimit, "entityClass")) {
+            //更新全部字段
+            if(fieldDataMap.get("ValidAmount").getValue() != null){
+                warehouseLimit.setValidAmount(new BigDecimal(fieldDataMap.get("ValidAmount").getValue().toString()));
+            }
+            if(fieldDataMap.get("FixedAmount").getValue() != null){
+                warehouseLimit.setFixedAmount(new BigDecimal(fieldDataMap.get("FixedAmount").getValue().toString()));
+            }
+            if(fieldDataMap.get("TempAmount").getValue() != null){
+                warehouseLimit.setForAmount(new BigDecimal(fieldDataMap.get("TempAmount").getValue().toString()));
+            }
+            if(fieldDataMap.get("TempAmountForBalance").getValue() != null){
+                warehouseLimit.setYueForAmount(new BigDecimal(fieldDataMap.get("TempAmountForBalance").getValue().toString()));
+            }
+
+
             KxsWarehouseLimit kxsWarehouseLimit = kxsWarehouseLimitMapper.selectOne(Wrappers.<KxsWarehouseLimit>lambdaQuery()
             KxsWarehouseLimit kxsWarehouseLimit = kxsWarehouseLimitMapper.selectOne(Wrappers.<KxsWarehouseLimit>lambdaQuery()
                     .eq(KxsWarehouseLimit::getWarehouseType, 0)
                     .eq(KxsWarehouseLimit::getWarehouseType, 0)
                     .eq(KxsWarehouseLimit::getUserId, id));
                     .eq(KxsWarehouseLimit::getUserId, id));
@@ -312,6 +329,8 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
     public void changeAccountMinData(DMLData dmlData) {
     public void changeAccountMinData(DMLData dmlData) {
         //修改的字段值
         //修改的字段值
         Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
         Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //全部字段值
+        Map<String, FieldData> fieldDataMap = dmlData.getFieldDataMap();
         //修改的字段
         //修改的字段
         List<String> changeFieldList = dmlData.getChangeFieldList();
         List<String> changeFieldList = dmlData.getChangeFieldList();
         //操作的主键
         //操作的主键
@@ -346,6 +365,21 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
             }
             }
         }
         }
         if (BeanUtil.isNotEmpty(warehouseLimit, "entityClass")) {
         if (BeanUtil.isNotEmpty(warehouseLimit, "entityClass")) {
+            //更新全部字段
+            if(fieldDataMap.get("ValidPreAmount").getValue() != null){
+                warehouseLimit.setValidAmount(new BigDecimal(fieldDataMap.get("ValidPreAmount").getValue().toString()));
+            }
+            if(fieldDataMap.get("ThisMonthPreAmount").getValue() != null){
+                warehouseLimit.setFixedAmount(new BigDecimal(fieldDataMap.get("ThisMonthPreAmount").getValue().toString()));
+            }
+            if(fieldDataMap.get("PreTempAmount").getValue() != null){
+                warehouseLimit.setForAmount(new BigDecimal(fieldDataMap.get("PreTempAmount").getValue().toString()));
+            }
+            if(fieldDataMap.get("PreTempAmountForBalance").getValue() != null){
+                warehouseLimit.setYueForAmount(new BigDecimal(fieldDataMap.get("PreTempAmountForBalance").getValue().toString()));
+            }
+
+
             KxsWarehouseLimit kxsWarehouseLimit = kxsWarehouseLimitMapper.selectOne(Wrappers.<KxsWarehouseLimit>lambdaQuery()
             KxsWarehouseLimit kxsWarehouseLimit = kxsWarehouseLimitMapper.selectOne(Wrappers.<KxsWarehouseLimit>lambdaQuery()
                     .eq(KxsWarehouseLimit::getWarehouseType, 1)
                     .eq(KxsWarehouseLimit::getWarehouseType, 1)
                     .eq(KxsWarehouseLimit::getUserId, id));
                     .eq(KxsWarehouseLimit::getUserId, id));