Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 e61186cbec713d4d7d6c7c685dc9576d0635a521

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java

@@ -252,7 +252,7 @@

            HashMap<String, Object> map1 = new HashMap<>();
            //TODO hzt
            map1.put("recv_no", "SR2023081514001");
            map1.put("recv_no", "SR2024017174604");
            // 手续费
            BigDecimal bigDecimal = allMoney.multiply(new BigDecimal("0.038")).setScale(2, RoundingMode.HALF_UP);
            payMoney = payMoney.subtract(bigDecimal);
@@ -561,7 +561,7 @@
//            }
            HashMap<String, Object> map1 = new HashMap<>();
            // TODO hzt
            map1.put("recv_no", "SR2023081514001");
            map1.put("recv_no", "SR2024017174604");
            map1.put("amt", erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");
            objects.add(map1);
            map.put("total_amt",erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");