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

src/main/java/org/rcisoft/business/memGoldCoinFlow/service/impl/MemGoldCoinFlowServiceImpl.java

@@ -47,6 +47,8 @@ public class MemGoldCoinFlowServiceImpl extends ServiceImpl<MemGoldCoinFlowRepos
     public CyPersistModel persist(MemGoldCoinFlow memGoldCoinFlow){
         //增加到金币流水表
         memGoldCoinFlow.setEndCount(memGoldCoinFlow.getCount() + memGoldCoinFlow.getBalance());
+        //修改创建人，方便小程序查询消费记录
+        memGoldCoinFlow.setCreateBy(String.valueOf(memGoldCoinFlow.getTargetId()));
         int line = baseMapper.insert(memGoldCoinFlow);
         //修改会员表的金币余额
         MemInfo memInfo = new MemInfo();
@@ -123,7 +125,7 @@ public class MemGoldCoinFlowServiceImpl extends ServiceImpl<MemGoldCoinFlowRepos
                 memGoldCoinFlow.setBeginTime(memGoldCoinFlow.getBeginTime()+" 00:00:00");
                 memGoldCoinFlow.setEndTime(memGoldCoinFlow.getEndTime()+" 23:59:59");
             }
-            memGoldCoinFlow.setTargetId(new BigInteger(CyUserUtil.getAuthenBusinessId()));
+            memGoldCoinFlow.setCreateBy(CyUserUtil.getAuthenBusinessId());
           return baseMapper.appQueryMemGoldCoinFlowsPaged(paginationUtility,memGoldCoinFlow);
         } else {
             //管理端

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

@@ -92,7 +92,7 @@
         where 1=1
         and mgcf.del_flag = '0'
         and mgcf.flag = '1'
-        and mgcf.target_id = #{entity.targetId}
+        and mgcf.create_by = #{entity.createBy}
         <if test="entity.beginTime !=null and entity.beginTime != '' ">
             and mgcf.create_date &gt;= #{entity.beginTime}
         </if>