记录和shopUser 问题

cash-api/market-server/src/main/java/com/czg/controller/admin/PointsConfigController.java

@@ -85,7 +85,7 @@ public class PointsConfigController {
     @SaAdminCheckPermission(parentName = "积分相关", value = "points:user:record", name = "积分-用户-积分记录")
     public CzgResult<Page<MkPointsUserRecord>> getPointsUserRecord(@RequestParam(required = false, defaultValue = "1") Integer page,
                                                                    @RequestParam(required = false, defaultValue = "10") Integer size,
-                                                                   @RequestParam Long id) {
+                                                                   @RequestParam(required = false) Long id) {
         return CzgResult.success(userRecordService.pageByPointsUserId(page, size, id));
     }
 }

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java

@@ -5,6 +5,7 @@ import com.czg.account.entity.ShopExtend;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.vo.FreeDineConfigVO;
+import com.czg.market.entity.MkPointsUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -54,4 +55,9 @@ public class ShopUserDetailDTO extends ShopUser {
      */
     private FreeDineConfigVO freeDineConfig;
 
+    /**
+     * 积分信息
+     */
+    private MkPointsUser pointsUser;
+
 }

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java

@@ -15,8 +15,10 @@ import com.czg.account.service.UserInfoService;
 import com.czg.enums.ShopUserFlowBizEnum;
 import com.czg.exception.CzgException;
 import com.czg.market.entity.MemberLevelConfig;
+import com.czg.market.entity.MkPointsUser;
 import com.czg.market.entity.SmsPushEventUser;
 import com.czg.market.service.MemberLevelConfigService;
+import com.czg.market.service.MkPointsUserService;
 import com.czg.market.service.OrderInfoService;
 import com.czg.market.service.TbMemberConfigService;
 import com.czg.market.vo.InviteUserVO;
@@ -37,6 +39,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.awt.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java

@@ -10,7 +10,9 @@ import com.czg.account.entity.*;
 import com.czg.account.service.*;
 import com.czg.config.RedisCst;
 import com.czg.exception.CzgException;
+import com.czg.market.entity.MkPointsUser;
 import com.czg.market.entity.MkShopCouponRecord;
+import com.czg.market.service.MkPointsUserService;
 import com.czg.market.service.MkShopCouponRecordService;
 import com.czg.resp.CzgResult;
 import com.czg.service.RedisService;
@@ -51,6 +53,8 @@ public class UShopUserServiceImpl implements UShopUserService {
     private ShopConfigMapper shopConfigMapper;
     @DubboReference
     private MkShopCouponRecordService couponRecordService;
+    @DubboReference
+    private MkPointsUserService pointsUserService;
 
     @Override
     public ShopUser getShopUserInfo(Long shopId, long userId) {
@@ -140,6 +144,8 @@ public class UShopUserServiceImpl implements UShopUserService {
         shopUserDetailDTO.setFreeDineConfig(freeDineConfigService.getConfig(shopInfoService.getMainIdByShopId(shopId)));
         shopUserDetailDTO.setPayPwd(userInfo.getPayPwd());
         shopUserDetailDTO.setUsePayPwd(userInfo.getUsePayPwd());
+        MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, shopUser.getId(), shopUser.getUserId());
+        shopUserDetailDTO.setPointsUser(pointsUser);
         return shopUserDetailDTO;
     }
 

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserRecordServiceImpl.java

@@ -23,6 +23,9 @@ public class MkPointsUserRecordServiceImpl extends ServiceImpl<MkPointsUserRecor
 
     @Override
     public Page<MkPointsUserRecord> pageByPointsUserId(Integer page, Integer size, Long mkPointsUserId) {
+        if (mkPointsUserId == null) {
+            return new Page<>();
+        }
         return page(Page.of(page, size), query().eq(MkPointsUserRecord::getMkPointsUserId, mkPointsUserId).orderBy(MkPointsUserRecord::getCreateTime, false));
     }
 

cash-service/market-service/src/main/resources/mapper/MkPointsUserRecordMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.czg.service.market.mapper.MkPointsUserRecordMapper">
 
     <select id="getPointsUserRecord" resultType="com.czg.market.entity.MkPointsUserRecord">
-        select *, shop.shop_name as shopName
+        select record.*, shop.shop_name as shopName
         from mk_points_user_record record
                  left join tb_shop_info shop on shop.id = record.shop_id
         where record.mk_points_user_id = #{mkPointsUserId}