Merge remote-tracking branch 'origin/test' into test

cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsLogService.java

@@ -2,9 +2,12 @@ package com.czg.account.service;
 
 import com.czg.account.dto.points.MemberPointsLogDTO;
 import com.czg.account.entity.MemberPointsLog;
+import com.czg.account.vo.PointsShopListVO;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
+import java.util.List;
+
 /**
  * 会员积分变动记录
  *
@@ -15,4 +18,5 @@ public interface MemberPointsLogService extends IService<MemberPointsLog> {
 
     Page<MemberPointsLogDTO> getMemberPointsLogPage(MemberPointsLogDTO param);
 
-}
+    List<PointsShopListVO> getList(long userId);
+}

cash-common/cash-common-service/src/main/java/com/czg/account/vo/PointsShopListVO.java

@@ -0,0 +1,13 @@
+package com.czg.account.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PointsShopListVO {
+    private String shopName;
+    private String logo;
+    private Long shopId;
+    private Integer accountPoints;
+}