Browse Source

Merge commit '4335bdda1757e39900054cb833f42a0569cb8ccc' into release

release_toaliyun_real
luozukai 6 years ago
parent
commit
379a3cbf19
6 changed files with 48 additions and 19 deletions
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201907101530__CHANGE_WX_MSG_LIMIT.sql
  2. +24
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
  5. +17
    -17
      mallinkService/src/main/resources/mapper/WxBusinessMapper.xml
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201907101530__CHANGE_WX_MSG_LIMIT.sql View File

@@ -0,0 +1,2 @@
alter table `wx_msg_limit`
change column `type` `type` tinyint(3) DEFAULT '0' COMMENT '1: 短信-验证码(24小时10条)2:短信-营销(24小时3条) 10:prepay_id(7天内3次), 12:form_id(7天内1次), 13.open_id for 小程序统一消息限制(2天内1次),14.open_id for 公众号模板消息限制(2天内1次)';

+ 24
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java View File

@@ -53,6 +53,14 @@ public class WxCouponOrderBVo extends WxCouponOrder{
this.cUserPhone = cUserPhone; this.cUserPhone = cUserPhone;
} }


public String getcuserPhone() {
return cUserPhone;
}

public void setcuserPhone(String cUserPhone) {
this.cUserPhone = cUserPhone;
}

@Excel(name = "会员手机号", width = 20, orderNum = "13") @Excel(name = "会员手机号", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="c用户绑定的手机号",name="cUserPhone") @io.swagger.annotations.ApiModelProperty(value="c用户绑定的手机号",name="cUserPhone")
private String cUserPhone; private String cUserPhone;
@@ -108,6 +116,22 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType") @io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType")
private Integer subsidyType; private Integer subsidyType;


public String getbUserName() {
return bUserName;
}

public void setbUserName(String bUserName) {
this.bUserName = bUserName;
}

public String getbuserName() {
return bUserName;
}

public void setbuserName(String bUserName) {
this.bUserName = bUserName;
}

@io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName")
private String bUserName; private String bUserName;
@io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone")


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java View File

@@ -241,6 +241,7 @@ public class WxFlowServiceImpl implements WxFlowService {
if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) {
//作废 //作废
wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode());
wxCouponService.saveOrUpdate(wxCoupon);
} }
} }
wxCoupon.setApprovalType(operateType); wxCoupon.setApprovalType(operateType);


+ 3
- 1
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml View File

@@ -113,7 +113,9 @@
<if test=" null != depositStatus ">and d.`status` = #{depositStatus}</if> <if test=" null != depositStatus ">and d.`status` = #{depositStatus}</if>
<if test=" null != id ">and br.`id` = #{id}</if> <if test=" null != id ">and br.`id` = #{id}</if>
<if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if> <if test=" null != merchantId ">and br.`merchant_id` = #{merchantId}</if>
<if test=" null != merchantName and ''!=merchantName ">and m.`name` like concat('%',#{merchantName},'%')</if>
<if test=" null != merchantName and ''!=merchantName ">and r.merchant_name like
concat('%',#{merchantName},'%')
</if>
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if> <if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if> <if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>


+ 17
- 17
mallinkService/src/main/resources/mapper/WxBusinessMapper.xml View File

@@ -86,62 +86,62 @@
round( round(
(select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt)) (select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt))
from wx_merchant m from wx_merchant m
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1)
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 )
/100,2) volume, /100,2) volume,
round( round(
(select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt)) (select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt))
from wx_merchant m from wx_merchant m
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1)
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 )
/ /
(select if(sum(ws.operation_area) is null,0,sum(ws.operation_area)) (select if(sum(ws.operation_area) is null,0,sum(ws.operation_area))
from wx_merchant m from wx_merchant m
left join wx_merchant_shop mtd on mtd.merchant_id = m.id left join wx_merchant_shop mtd on mtd.merchant_id = m.id
left join wx_shop ws on(mtd.shop_id = ws.id) left join wx_shop ws on(mtd.shop_id = ws.id)
where m.business_id = b.id and m.tenant_id=#{tenantId} and m.status = 1)
where m.business_id = b.id and m.tenant_id=#{tenantId} and m.status = 1 and m.is_del = 0 )
/100,2) sale, /100,2) sale,
round( round(
(select (select
(select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m (select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m
left join wx_bill_rent br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1)
left join wx_bill_rent br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 )
+ +
(select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m (select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m
left join wx_bill_property br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1)
left join wx_bill_property br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 )
from dual) / from dual) /
(select if(sum(ws.operation_area) is null,0,sum(ws.operation_area)) (select if(sum(ws.operation_area) is null,0,sum(ws.operation_area))
from wx_merchant m from wx_merchant m
left join wx_merchant_shop mtd on mtd.merchant_id = m.id left join wx_merchant_shop mtd on mtd.merchant_id = m.id
left join wx_shop ws on(mtd.shop_id = ws.id) left join wx_shop ws on(mtd.shop_id = ws.id)
where m.business_id = b.id and m.tenant_id=#{tenantId} and m.status = 1)
where m.business_id = b.id and m.tenant_id=#{tenantId} and m.status = 1 and m.is_del = 0 )
/100,2) rent, /100,2) rent,


round( round(
round( round(
(select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt)) (select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt))
from wx_merchant m from wx_merchant m
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1)
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 )
/ /
(select if(sum(ws.operation_area) is null,0,sum(ws.operation_area)) (select if(sum(ws.operation_area) is null,0,sum(ws.operation_area))
from wx_merchant m from wx_merchant m
left join wx_merchant_shop mtd on mtd.merchant_id = m.id left join wx_merchant_shop mtd on mtd.merchant_id = m.id
left join wx_shop ws on(mtd.shop_id = ws.id) left join wx_shop ws on(mtd.shop_id = ws.id)
where m.business_id = b.id and m.tenant_id=#{tenantId} and m.status = 1)
where m.business_id = b.id and m.tenant_id=#{tenantId} and m.status = 1 and m.is_del = 0 )
/100,2) /100,2)
/ /
round( round(
(select (select
(select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m (select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m
left join wx_bill_rent br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1)
left join wx_bill_rent br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 )
+ +
(select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m (select if(sum(br.receive_pay) is null,0,sum(br.receive_pay)) receive_pay from wx_merchant m
left join wx_bill_property br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1)
left join wx_bill_property br on(br.merchant_id=m.id) where m.business_id = b.id and m.tenant_id=#{tenantId} and br.receive_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 )
from dual) / from dual) /
(select if(sum(ws.operation_area) is null,0,sum(ws.operation_area)) (select if(sum(ws.operation_area) is null,0,sum(ws.operation_area))
from wx_merchant m from wx_merchant m
left join wx_merchant_shop mtd on mtd.merchant_id = m.id left join wx_merchant_shop mtd on mtd.merchant_id = m.id
left join wx_shop ws on(mtd.shop_id = ws.id) left join wx_shop ws on(mtd.shop_id = ws.id)
where m.business_id = b.id and m.status = 1)
where m.business_id = b.id and m.status = 1 and m.is_del = 0 )
/100,2) /100,2)
,4) ,4)
rentSaleRate, rentSaleRate,
@@ -149,10 +149,10 @@
round( round(
(select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt)) (select if(sum(mtd.trade_amt) is null,0,sum(mtd.trade_amt))
from wx_merchant m from wx_merchant m
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1) /
(select count(mtd.id)
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 ) /
(select sum(mtd.trade_count)
from wx_merchant m from wx_merchant m
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.create_date between #{startdate} and #{enddate} and m.status = 1)
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id where m.business_id = b.id and m.tenant_id=#{tenantId} and mtd.report_date between #{startdate} and #{enddate} and m.status = 1 and m.is_del = 0 )
/100,2) comPrice /100,2) comPrice
from wx_business b from wx_business b
@@ -169,7 +169,7 @@
from wx_merchant m from wx_merchant m
left join wx_merchant_shop mtd on mtd.merchant_id = m.id left join wx_merchant_shop mtd on mtd.merchant_id = m.id
left join wx_shop ws on(mtd.shop_id = ws.id) left join wx_shop ws on(mtd.shop_id = ws.id)
where m.status = 1 and m.business_id = #{id} and m.tenant_id=#{tenantId})
where m.status = 1 and m.is_del = 0 and m.business_id = #{id} and m.tenant_id=#{tenantId})
/100,2) saleRate, /100,2) saleRate,


round( round(
@@ -184,7 +184,7 @@
from wx_merchant m from wx_merchant m
left join wx_merchant_shop mtd on mtd.merchant_id = m.id left join wx_merchant_shop mtd on mtd.merchant_id = m.id
left join wx_shop ws on(mtd.shop_id = ws.id) left join wx_shop ws on(mtd.shop_id = ws.id)
where m.status = 1 and m.business_id = #{id} and m.tenant_id=#{tenantId})
where m.status = 1 and m.is_del = 0 and m.business_id = #{id} and m.tenant_id=#{tenantId})
/100,2) /100,2)
) )
,2) devoteRate ,2) devoteRate
@@ -194,7 +194,7 @@
left join wx_merchant_shop wmt on wmt.merchant_id = m.id left join wx_merchant_shop wmt on wmt.merchant_id = m.id
left join wx_shop ws on(wmt.shop_id = ws.id) left join wx_shop ws on(wmt.shop_id = ws.id)
where m.business_id=#{id} and m.tenant_id=#{tenantId} where m.business_id=#{id} and m.tenant_id=#{tenantId}
and m.status = 1
and m.status = 1 and m.is_del = 0
and mtd.create_date between #{startdate} and #{enddate} and mtd.create_date between #{startdate} and #{enddate}
group by m.id group by m.id
order by devoteRate desc order by devoteRate desc


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml View File

@@ -258,7 +258,7 @@
<if test=" null != status "> <if test=" null != status ">
and ms.`status` = #{status} and ms.`status` = #{status}
</if> </if>
<if test=" null != ouPhone ">
<if test=" null != ouPhone and '' != ouPhone ">
and ou.`phone` = #{ouPhone} and ou.`phone` = #{ouPhone}
</if> </if>
<if test=" null != startdate and null!=enddate"> <if test=" null != startdate and null!=enddate">


Loading…
Cancel
Save