商家结算卡信息

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/domain/vo/BusinessDayBillVo.java

@@ -162,11 +162,16 @@ public class BusinessDayBillVo implements Serializable {
     @ApiModelProperty(value = "周几")
     private Integer weekValue;
 
+    @ApiModelProperty(value = "年-月")
+    private String yearMonthValue;
+
     public void loadWeekValue() {
         if(billDay != null)
         {
             //把日期转换成星期几
-            weekValue = DateUtil.dayOfWeek(billDay);
+            int rawValue = DateUtil.dayOfWeek(billDay);
+            // 转换为ISO标准：周一=1，周日=7
+            weekValue = (rawValue % 7 == 1) ? 7 : rawValue - 1;
         }
     }
 

ruoyi-shop/src/main/java/com/ruoyi/shop/product/domain/vo/ProductCountVo.java

@@ -17,6 +17,6 @@ public class ProductCountVo implements java.io.Serializable{
     @ApiModelProperty("所有商品数量")
     private Integer allCount;
 
-    @ApiModelProperty("所有商品数量")
+    @ApiModelProperty("库存紧张数量")
     private Integer stockTenseCount;
 }

ruoyi-user/src/main/java/com/ruoyi/user/domain/vo/UserStatisticsVo.java

@@ -46,7 +46,9 @@ public class UserStatisticsVo {
         if(createDay != null)
         {
             //把日期转换成星期几
-            weekValue = DateUtil.dayOfWeek(DateUtils.parseDate(createDay));
+            int rawValue = DateUtil.dayOfWeek(DateUtils.parseDate(createDay));
+            // 转换为ISO标准：周一=1，周日=7
+            weekValue = (rawValue % 7 == 1) ? 7 : rawValue - 1;
         }
     }
 

ruoyi-user/src/main/java/com/ruoyi/user/domain/vo/UserVo.java

@@ -194,4 +194,8 @@ public class UserVo {
     private BigDecimal alreadySubsidyMoney;
     @ApiModelProperty("累计可用积分")
     private BigDecimal availablePoint;
+    @ApiModelProperty("累计商城消费")
+    private BigDecimal shopConsume;
+    @ApiModelProperty("累计扫码消费")
+    private BigDecimal lineConsume;
 }

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -132,11 +132,17 @@ public class UserServiceImpl implements IUserService {
             userBo.setId(item.getId());
             item.setSurplusQueueMoney(baseMapper.querySurplusQueueMoney(userBo));
             UserStatisticsVo userStatisticsVo = baseMapper.querySubsidyMoney(userBo);
-            item.setShouldSubsidyMoney(userStatisticsVo.getShouldSubsidyMoney());
-            item.setAlreadySubsidyMoney(userStatisticsVo.getAlreadySubsidyMoney());
+            if (ObjectUtil.isNotNull(userStatisticsVo)) {
+                item.setShouldSubsidyMoney(userStatisticsVo.getShouldSubsidyMoney());
+                item.setAlreadySubsidyMoney(userStatisticsVo.getAlreadySubsidyMoney());
+            }
             if (!isBusiness) {
                 UserStatisticsVo statistics = baseMapper.statistics(userBo);
-                item.setAvailablePoint(statistics.getAvailablePoint());
+                if (ObjectUtil.isNotNull(statistics)) {
+                    item.setAvailablePoint(statistics.getAvailablePoint());
+                    item.setShopConsume(statistics.getShopConsume());
+                    item.setLineConsume(statistics.getLineConsume());
+                }
             }
             return item;
         }).collect(Collectors.toList());

ruoyi-user/src/main/resources/mapper/user/UserMapper.xml

@@ -153,7 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectBusinessPage" resultType="com.ruoyi.user.domain.vo.UserVo">
-        select u.*, ub.integral_able availablePoint from tb_user u
+        select u.*, ub.integral_able availablePoint, ub.order_total_consumption shopConsume, ub.online_order_total_consumption lineConsume
+        from tb_user u
         join tb_user_business_role ub on u.id = ub.user_id
         where ub.business_id = #{bo.businessId}
         <if test="bo.mobile != null and bo.mobile != ''">