Merge branch 'gyj' into dev

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopUserFlow.java

@@ -5,16 +5,22 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * @author GYJ
  */
+@Entity
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("tb_shop_user_flow")
+@Table(name="tb_shop_user_flow")
 public class TbShopUserFlow extends Model<TbShopUserFlow> {
+    @Id
     private Integer id;
 
     private Integer shopUserId;

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/ShopUserMapper.java

@@ -1,5 +1,7 @@
 package cn.ysk.cashier.mybatis.mapper;
 
+import cn.ysk.cashier.dto.shop.TbShopRechargeListDto;
+import cn.ysk.cashier.dto.shop.TbShopRechargeRespDto;
 import cn.ysk.cashier.dto.shop.TbShopUserQueryCriteria;
 import cn.ysk.cashier.pojo.shop.TbShopUser;
 import cn.ysk.cashier.vo.ShopUserInfoVo;
@@ -30,5 +32,25 @@ public interface ShopUserMapper extends BaseMapper<TbShopUser> {
             "</where>" +
             "</script>")
     IPage<ShopUserInfoVo> queryUser(TbShopUserQueryCriteria param, Page pageInfo);
+
+    @Select("<script> " +
+            "select " +
+            "tsuf.id as id, " +
+            "tsu.shop_id as shop_id, " +
+            "tsi.shop_name, " +
+            "tsu.id as user_id, " +
+            "tsu.telephone as user_phone, " +
+            "tsu.`name` as user_name, " +
+            "tsuf.amount as recharge_amount, " +
+            "tsuf.biz_name as recharge_type, " +
+            "tsuf.create_time as recharge_time " +
+            "            from tb_shop_user_flow  tsuf " +
+            "            left join tb_shop_user as tsu  on  tsuf.shop_user_id = tsu.id " +
+            "left join tb_shop_info as tsi on tsi.id = tsu.shop_id " +
+            "where tsuf.create_time BETWEEN #{param.startTime} and #{param.endTime} and tsuf.biz_code in ('cashMemberIn', 'scanMemberIn') " +
+            "            and tsu.shop_id = #{param.shopId} " +
+            "order by tsuf.create_time desc " +
+            "</script>")
+    IPage<TbShopRechargeRespDto> queryRechargeList(TbShopRechargeListDto param, Page pageInfo);
 }