Merge remote-tracking branch 'origin/milestone-20251203-冲刺计划' into milestone-20251203-冲刺计划

# Conflicts:
#	src/main/java/com/example/demo/service/Temporary/RedService.java

src/main/java/com/example/demo/service/Temporary/RedService.java

@@ -17,7 +17,7 @@ public interface RedService {
 
     void addAmount(Integer jwcode,BigDecimal sum, Integer type);
     String sendJwcode(Integer jwcode);
-    String sendConsumeJwcode(Integer jwcode, Integer price);
 
     BigDecimal selectRedSum(Integer jwcode);
+    String sendConsumeJwcode(Integer jwcode, BigDecimal price);
 }

src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java

@@ -112,8 +112,8 @@ public class RedServiceImpl implements RedService {
             return "{\"success\":false,\"msg\":\"网络异常\"}";
         }
     }
-    @Override
-    public  String sendConsumeJwcode(Integer jwcode, Integer price) {
+     @Override
+    public  String sendConsumeJwcode(Integer jwcode, BigDecimal price) {
         try {
             String body = JSON.toJSONString(java.util.Map.of("jwcode", jwcode,"discount",price));
             HttpRequest request = HttpRequest.newBuilder()

src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java

@@ -206,7 +206,7 @@ public class ConsumeServiceImpl implements ConsumeService {
         }
 
 
-        redService.sendConsumeJwcode(consumeUser.getJwcode(),consumeUser.getPrice().intValue()-consumeUser.getSumGold().intValue());
+        redService.sendConsumeJwcode(consumeUser.getJwcode(),(consumeUser.getPrice().subtract(consumeUser.getSumGold())).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
         // }
         return Result.success();
     }