Browse Source

Merge commit '7e674b376e99ec39e746b47147134506a4b432fd' into release

release_toaliyun_real
luozukai 6 years ago
parent
commit
0bb9ed09d0
3 changed files with 7 additions and 1 deletions
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml
  3. +1
    -0
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

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

@@ -1069,6 +1069,11 @@ public class WxFlowServiceImpl implements WxFlowService {
} else if (isBill(flowType)) {
msgReplaceMap.put("bustype", "账单");
msgReplaceMap.put("contract", businessId.toString());
} else if (isCoupon(flowType)) {
wxMsgRecord.setModelType(EnumMsgModel.FLOW_C_REJECT_NODIFY.getCode());
WxCoupon wxCoupon = this.wxCouponMapper.selectByPrimaryKey(businessId);
msgReplaceMap.put("type",EnumCouponType.getEnum(wxCoupon.getType()).getMessage());
msgReplaceMap.put("name",wxCoupon.getTitle());
}
wxMsgRecord.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());


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

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


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

@@ -254,6 +254,7 @@
and s.is_del = 0
and ms.is_del = 0
and m.status = 1
and m.is_del = 0
group by m.business_id
</select>


Loading…
Cancel
Save