Merge branch 'milestone-20251215-优化' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20251209-现金管理三期

# Conflicts:
#	src/main/resources/mapper/WorkBenchMapper.xml

src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java

@@ -83,4 +83,7 @@ public class ConsumeUser implements Serializable {
     private Integer flag; //是否为员工号
     @ExcelProperty("折扣金币")
     private BigDecimal price; // 折扣金币
+    @ExcelIgnore
+    private Integer redMoney; //是否用红包
+
 }

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

@@ -204,10 +204,9 @@ public class ConsumeServiceImpl implements ConsumeService {
         }catch (Exception  e){
             log.warn("消耗累加失败，主流程继续 | jwcode={}", consumeUser.getJwcode(), e);
         }
-
-
+        if(consumeUser.getRedMoney()==1){
         redService.sendConsumeJwcode(consumeUser.getJwcode(),(consumeUser.getPrice().subtract(consumeUser.getSumGold())).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
-        // }
+        }
         return Result.success();
     }
 //