增加了web端金币流水

src/main/java/org/rcisoft/business/memGoldCoinFlow/controller/MemGoldCoinFlowController.java

@@ -134,12 +134,13 @@ public class MemGoldCoinFlowController extends CyPaginationController<MemGoldCoi
             case "2": excelName="金币流水表信息.csv";break;
         }
         List<MemGoldCoinFlow> memGoldCoinFlowList = memGoldCoinFlowServiceImpl.export(memGoldCoinFlow);
+
         CyEpExcelUtil.exportExcel(memGoldCoinFlowList, "金币流水表信息", "金币流水表信息", MemGoldCoinFlow.class, excelName, response);
     }
 
     @PreAuthorize("@cyPerm.hasPerm('mem:goldCoinFlow:list')")
-    @CyOpeLogAnno(title = "system-金币流水表管理-查询单个会员金币流水表", businessType = CyLogTypeEnum.QUERY)
-    @Operation(summary="分页查询单个会员金币流水表集合", description="分页查询金币流水表集合")
+    @CyOpeLogAnno(title = "system-金币流水表管理-分页查询单个会员消费记录", businessType = CyLogTypeEnum.QUERY)
+    @Operation(summary="分页查询单个会员消费记录", description="分页查询单个会员消费记录")
     @GetMapping(value = "/queryMemGoldCoinFollowList")
     public CyGridModel queryMemGoldCoinFlowByPagination(MemGoldCoinFlow memGoldCoinFlow) {
         IPage<MemGoldCoinFlow> memGoldCoinFlowIPage = memGoldCoinFlowServiceImpl.queryMemGoldCoinFlowsByPagination(getPaginationUtility(), memGoldCoinFlow);

src/main/java/org/rcisoft/business/memGoldCoinFlow/entity/MemGoldCoinFlow.java

@@ -75,13 +75,27 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      @TableField(exist = false)
      private Integer memberId;
 
+     /**
+      * 发起人会员号
+      */
+     @Excel(name = "发起用户会员号", orderNum = "5", width = 20)
+     @TableField(exist = false)
+     private String userCode;
+
      //用户昵称
-     @Excel(name = "发起用户", orderNum = "5", width = 20)
+     @Excel(name = "发起用户", orderNum = "6", width = 20)
      @TableField(exist = false)
      private String userNickName;
 
+     /**
+      * 目标人会员号
+      */
+     @Excel(name = "目标用户会员号", orderNum = "7", width = 20)
+     @TableField(exist = false)
+     private String targetCode;
+
      //目标用户昵称
-     @Excel(name = "目标用户", orderNum = "6", width = 20)
+     @Excel(name = "目标用户", orderNum = "8", width = 20)
      @TableField(exist = false)
      private String targetNickName;
 

src/main/resources/mapper/business/memGoldCoinFlow.mapper/MemGoldCoinFlowMapper.xml

@@ -21,7 +21,9 @@
     <select id="queryMemGoldCoinFlows" resultMap="BaseResultMap">
         select mgcf.*,
         mi.mem_nick_name as userNickName,
-        mi2.mem_nick_name as targetNickName
+        mi.mem_code as userCode,
+        mi2.mem_nick_name as targetNickName,
+        mi2.mem_code as targetCode
         from mem_gold_coin_flow mgcf
         left join mem_info mi on mi.user_id = mgcf.create_by
         left join mem_info mi2 on mi2.user_id = mgcf.target_id
@@ -51,13 +53,21 @@
         <if test="entity.targetNickName !=null and entity.targetNickName != '' ">
             and mi2.mem_nick_name like concat('%',#{entity.targetNickName},'%')
         </if>
+        <if test="entity.userCode !=null and entity.userCode != '' ">
+            and mi.mem_code like concat('%',#{entity.userCode},'%')
+        </if>
+        <if test="entity.targetCode !=null and entity.targetCode != '' ">
+            and mi2.mem_code like concat('%',#{entity.targetCode},'%')
+        </if>
         ORDER BY mgcf.business_id DESC
     </select>
 
     <select id="queryGoldCoinFlowsPaged" resultType="org.rcisoft.business.memGoldCoinFlow.entity.MemGoldCoinFlow">
         select mgcf.*,
         mi.mem_nick_name as userNickName,
-        mi2.mem_nick_name as targetNickName
+        mi.mem_code as userCode,
+        mi2.mem_nick_name as targetNickName,
+        mi2.mem_code as targetCode
         from mem_gold_coin_flow mgcf
         left join mem_info mi on mi.user_id = mgcf.create_by
         left join mem_info mi2 on mi2.user_id = mgcf.target_id
@@ -87,6 +97,12 @@
             <if test="entity.targetNickName !=null and entity.targetNickName != '' ">
                 and mi2.mem_nick_name like concat('%',#{entity.targetNickName},'%')
             </if>
+            <if test="entity.userCode !=null and entity.userCode != '' ">
+                and mi.mem_code like concat('%',#{entity.userCode},'%')
+            </if>
+            <if test="entity.targetCode !=null and entity.targetCode != '' ">
+                and mi2.mem_code like concat('%',#{entity.targetCode},'%')
+            </if>
         ORDER BY mgcf.business_id DESC
     </select>
     <select id="appQueryMemGoldCoinFlowsPaged"