优化货权转移计算业务,全部替换为BigDecimal类计算

src/main/java/com/th/demo/service/impl/ware/ChangeServiceImpl.java

@@ -30,6 +30,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -56,11 +60,12 @@ public class ChangeServiceImpl implements ChangeService {
 
     /**
      * 货权转移
-     * 解决：货权转移后Cargo重量不减少、中途return不扣重量、空指针、事务部分提交BUG
+     * 修复：浮点数精度问题、重复更新问题、逻辑校验问题
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String changeCustomer(String json, String customer, String address, String userId, String belongId) throws Exception {
+
         // 1. 基础参数非空校验
         if (!StringUtils.hasText(json) || !StringUtils.hasText(customer) || !StringUtils.hasText(userId) || !StringUtils.hasText(belongId)) {
             throw new Exception("传入参数不能为空");
@@ -93,52 +98,79 @@ public class ChangeServiceImpl implements ChangeService {
             throw new Exception("原货主不存在");
         }
 
-        // 4. 查询货权配置记录
+        // 4. 校验新旧货主不能相同
+        if (oldCustomer.getId().equals(newCustomer.getId())) {
+            throw new Exception("新旧货主不能相同");
+        }
+
+        // 5. 查询货权配置记录
         Cargo cargo = cargoMapper.selectByByFkAndCustomer(oldCustomer.getId(), newCustomer.getId(), belongId);
-        double sumWeight = 0;
+
+        // 使用BigDecimal处理重量
+        BigDecimal availableWeight = BigDecimal.ZERO;
+        BigDecimal sumWeightBD = BigDecimal.ZERO;
+
         if (cargo != null) {
-            sumWeight = cargo.getSumWeight();
-            // 货权可用重量为0直接拦截
-            if (sumWeight <= 0) {
+            sumWeightBD = BigDecimal.valueOf(cargo.getSumWeight());
+            availableWeight = sumWeightBD;
+            // 货权可用重量为0直接拦截（使用精度比较）
+            if (availableWeight.compareTo(BigDecimal.ZERO) <= 0) {
                 throw new Exception("货权信息已维护，可用转移重量为0");
             }
         }
 
-        double useWeight = 0;// 已累计使用转移重量
-        int num = 0;// 数据库受影响行数 初始化
-        String recordType;
+        // 6. 计算需要转移的总重量
+        BigDecimal needTotalWeight = BigDecimal.ZERO;
+        for (Store store : storeList) {
+            if (store != null && store.getWeight() > 0) {
+                needTotalWeight = needTotalWeight.add(BigDecimal.valueOf(store.getWeight()));
+            }
+        }
+
+        // 7. 总重量校验（提前校验，避免处理一半才失败）
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+        System.out.println("时间"+sdf.format(new Date()));
+        System.out.println("可用重量"+availableWeight.stripTrailingZeros().toPlainString());
+        System.out .println("需要总重量"+needTotalWeight.stripTrailingZeros().toPlainString());
+        if (cargo != null && availableWeight.compareTo(needTotalWeight) < 0) {
+            throw new Exception(String.format("货权转移重量不足。可用: %s, 转移重量: %s",
+                    availableWeight.stripTrailingZeros().toPlainString(),
+                    needTotalWeight.stripTrailingZeros().toPlainString()));
+        }
+        // 8. 循环逐条处理库存转移
+        BigDecimal usedWeight = BigDecimal.ZERO;
+        int affectedRows = 0;
 
-        // 5. 循环逐条处理库存转移
         for (Store store : storeList) {
             if (store == null || store.getWeight() <= 0) {
                 continue;
             }
-            double currentWeight = store.getWeight();
 
-            // 重量不足校验
-            if (sumWeight > 0 && (sumWeight - useWeight - currentWeight) < 0) {
-                throw new Exception("货权转移重量不足");
-            }
+            BigDecimal currentWeight = BigDecimal.valueOf(store.getWeight());
 
-            // 判断记录类型
+            // 9. 判断记录类型（如果新货主名跟库存老货主名一样，则记录类型为0）
+            String recordType;
             if (newCustomer.getName().equals(store.getCustomer().getName())) {
                 recordType = "0";
             } else {
                 recordType = "1";
                 // 插入账户明细
                 AccountDetail accountDetail = getAccountDetail(store, userId, belongId);
-                num += accountDetailMapper.insert(accountDetail);
+                affectedRows += accountDetailMapper.insert(accountDetail);
             }
 
-            // 插入变更记录
+            // 10. 插入变更记录
             ChangeRecord changeRecord = getChangeRecord(recordType, store, newCustomer, address, userId, belongId);
-            num += changeRecordMapper.insert(changeRecord);
+            affectedRows += changeRecordMapper.insert(changeRecord);
+
+            // 11. 保存老货主ID
+            String oldCustomerId = store.getCustomer().getId();
 
-            // 修改库存归属
+            // 12. 修改库存归属
             store.setCustomer(newCustomer);
-            store.setFkComponyId(oldCustomer.getId());
+            store.setFkComponyId(oldCustomerId);
 
-            // 地址处理
+            // 13. 地址处理
             if (StringUtils.hasText(address)) {
                 if ("0".equals(address)) {
                     store.setReceiveAddress("");
@@ -147,41 +179,41 @@ public class ChangeServiceImpl implements ChangeService {
                 }
             }
 
-            // 更新库存
-            num += storeMapper.updateByPrimaryKey(store);
-            num += storeMapper.updateFkById(store);
+            // 14. 更新库存（合并为一次更新）
+            affectedRows += storeMapper.updateByPrimaryKey(store);
 
-            // 累加已使用重量
-            useWeight += currentWeight;
+            // 15. 累加已使用重量
+            usedWeight = usedWeight.add(currentWeight);
 
-            // ========== 关键修复：逐条实时扣减货权重量，不放到循环外 ==========
+            // 16. 逐条实时扣减货权重量（使用BigDecimal保证精度）
             if (cargo != null) {
-                cargo.setSumWeight(cargo.getSumWeight() - currentWeight);
-                cargo.setUseWeight(cargo.getUseWeight() + currentWeight);
-                // 立即更新数据库，每处理一条扣一条，避免中途中断完全不扣
-                num += cargoMapper.updateByPrimaryKey(cargo);
+                BigDecimal newSumWeight = BigDecimal.valueOf(cargo.getSumWeight()).subtract(currentWeight);
+                BigDecimal newUseWeight = BigDecimal.valueOf(cargo.getUseWeight()).add(currentWeight);
+                cargo.setSumWeight(newSumWeight.doubleValue());
+                cargo.setUseWeight(newUseWeight.doubleValue());
+                affectedRows += cargoMapper.updateByPrimaryKey(cargo);
             }
         }
 
-        // 6. 批量处理完后 插入货权变更记录
-        if (cargo != null && useWeight > 0) {
+        // 17. 批量处理完后插入货权变更记录
+        if (cargo != null && usedWeight.compareTo(BigDecimal.ZERO) > 0) {
             CargoChangeRecord cargoChangeRecord = new CargoChangeRecord();
             cargoChangeRecord.setUperCustomer(cargo.getUperCustomer());
             cargoChangeRecord.setCustomer(cargo.getCustomer());
             cargoChangeRecord.setChangeFrom("货权转移");
-            cargoChangeRecord.setWeight(useWeight);
+            cargoChangeRecord.setWeight(usedWeight.doubleValue());
             cargoChangeRecord.setSubStr("减少");
             cargoChangeRecord.setModifyTime(new Date());
             cargoChangeRecord.setModifyUser(new SysUser(userId));
-//            cargoChangeRecord.setCancelFlag("0");
-            num += cargoChangeRecordMapper.insert(cargoChangeRecord);
+            affectedRows += cargoChangeRecordMapper.insert(cargoChangeRecord);
         }
 
-        // 7. 返回结果
-        return Tools.moreThanZeroResultJSON(num);
+        // 18. 返回结果
+        return Tools.moreThanZeroResultJSON(affectedRows);
     }
 
 
+
     private ChangeRecord getChangeRecord(String recordType, Store store, Customer customer, String receiveAddress, String userId, String belongId) {
         ChangeRecord record = new ChangeRecord();
         record.setRecordType(recordType);