From a300afab1c25d42c0a9f0fafd6d7cbf3b79361f0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 24 May 2021 17:28:15 +0800 Subject: [PATCH] tt --- .../iformall/domain/po/tt/TtUpSettlein.java | 61 +++++++++++++ .../iformall/mapper/TtUpSettleinMapper.java | 13 +++ .../service/tt/impl/TtCouponServiceImpl.java | 3 +- .../main/resources/mapper/TtCUserMapper.xml | 13 +-- .../main/resources/mapper/TtOrderMapper.xml | 8 +- .../resources/mapper/TtUpSettleinMapper.xml | 90 +++++++++++++++++++ 6 files changed, 174 insertions(+), 14 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/TtUpSettleinMapper.java create mode 100644 mallinkService/src/main/resources/mapper/TtUpSettleinMapper.xml diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java new file mode 100644 index 000000000..f3cd6b1f9 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtUpSettlein.java @@ -0,0 +1,61 @@ +package com.iformall.domain.po.tt; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.util.Date; + +@TableName(value = "tt_up_settlein") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class TtUpSettlein extends TenantEntity { + + protected Long id; + + private Long cuserId; + + @io.swagger.annotations.ApiModelProperty(value="邀请码",name="invitationCode") + private String invitationCode; + @io.swagger.annotations.ApiModelProperty(value="联系人",name="liaisonMan") + private String liaisonMan; + @io.swagger.annotations.ApiModelProperty(value="联系电话",name="liaisonPhone") + private String liaisonPhone; + + @io.swagger.annotations.ApiModelProperty(value="抖音号",name="name") + private String ttUserName; + @io.swagger.annotations.ApiModelProperty(value="",name="ttCountFans") + private String ttCountFans; + + @io.swagger.annotations.ApiModelProperty(value="类型",name="bussinessTypes") + private String bussinessTypes; + + @io.swagger.annotations.ApiModelProperty(value="说明",name="explain") + private String explain; + + @io.swagger.annotations.ApiModelProperty(value = "处理状态0:未处理,1已处理", name = "handleStatus") + private Integer handleStatus; + @io.swagger.annotations.ApiModelProperty(value="备注",name="remark") + private String remark; + + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-起始时间",name="startdate") + private Date startdate; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") + private Date enddate; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtUpSettleinMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtUpSettleinMapper.java new file mode 100644 index 000000000..77f9e4337 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/TtUpSettleinMapper.java @@ -0,0 +1,13 @@ +package com.iformall.mapper; + + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.tt.TtUpSettlein; + +import java.util.List; + +public interface TtUpSettleinMapper extends CommonMapper { + + List findList(TtUpSettlein record); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java index 6451dee0e..32d41671b 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.tt.TtCoupon; import com.iformall.domain.po.tt.TtUserCollect; @@ -135,7 +136,7 @@ public class TtCouponServiceImpl implements TtCouponService { // WxMerchant author = wxMerchantService.getById(byId.getMerchantId()); // byId.setMerchantName(author.getName()); // byId.setMerchantPic(author.getImgUrl()); -// byId.setAuthor(wxMerchantService.getById(byId.getMerchantId())); + byId.setAuthor(wxMerchantService.getById(byId.getMerchantId())); if(byId.getType().equals(EnumTtCouponType.COUPON_COLUMN.getCode())){ TtCoupon couponQ = new TtCoupon(); couponQ.setColumnId(productId); diff --git a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml index 28a889b18..2bc3c2e2b 100644 --- a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml @@ -150,12 +150,11 @@ and `score` = #{score} - - and `update_date` = #{updateDate} + + and `create_date` >= #{startdate} - - - and `create_date` = #{createDate} + + and `create_date` <= #{enddate} @@ -166,10 +165,6 @@ and `token` like concat('%', #{token},'%') - - and `expire_time` = #{expireTime} - - and `latitude` = #{latitude} diff --git a/mallinkService/src/main/resources/mapper/TtOrderMapper.xml b/mallinkService/src/main/resources/mapper/TtOrderMapper.xml index 5bfbf940b..9821b3635 100644 --- a/mallinkService/src/main/resources/mapper/TtOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtOrderMapper.xml @@ -108,19 +108,19 @@ order by o.`update_date` desc - select - from wx_order o + from tt_order o left join tt_c_user u on o.c_user_id = u.id left join tt_coupon c on o.product_id = c.id left join wx_merchant m on c.merchant_id = m.id - select count(1) - from wx_order + from tt_order where 1 = 1 and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/TtUpSettleinMapper.xml b/mallinkService/src/main/resources/mapper/TtUpSettleinMapper.xml new file mode 100644 index 000000000..79997028b --- /dev/null +++ b/mallinkService/src/main/resources/mapper/TtUpSettleinMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`cuser_id`,`invitation_code`,`liaison_man`,`liaison_phone`, + `tt_user_name`,`tt_count_fans`,`bussiness_types`,`explain`, + `remark`,`handle_status`,`create_date`,`update_date` + + + + where `is_del` = 0 + + + and `id` = #{id} + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + + and `cuser_id` = #{cuserId} + + + + and `invitation_code` = #{invitationCode} + + + + and `liaison_man` like concat('%', #{liaisonMan},'%') + + + + and `liaison_phone` like concat('%', #{liaisonPhone},'%') + + + + and `tt_user_name` like concat('%', #{ttUserName},'%') + + + + and `handle_status` = #{handleStatus} + + + + and `create_date` >= #{startdate} + + + and `create_date` <= #{enddate} + + + + and `id` in + + #{idItem} + + + order by ${sortColumns} + + + + +