diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022032800001__msg.sql b/mallinkAdmin/src/main/resources/db/migration/V2022032800001__msg.sql new file mode 100644 index 000000000..6c88fdcc1 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022032800001__msg.sql @@ -0,0 +1,8 @@ +ALTER TABLE `mallink`.`wx_appinfo` +ADD COLUMN `sort_url` varchar(255) COMMENT '小程序链接' AFTER `plat`; + + + +INSERT INTO `mallink`.`wx_msg_validationcode_model`(`id`, `tenant_id`, `parent_tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `open`, `msg_type`, `role_type`, `model_code`) VALUES (666429058236550321, '1028', NULL, 33, '抖音退款通知', '富茂', '您购买的[${name}]已发起全部退款申请,预计1-3个自然日商家处理完成,请耐心等待。', '2022-03-28 17:57:59', 1, 0, NULL, NULL, 0, 1, 0, 'SMS_236550321'); +INSERT INTO `mallink`.`wx_msg_validationcode_model`(`id`, `tenant_id`, `parent_tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `open`, `msg_type`, `role_type`, `model_code`) VALUES (666429058236560256, '1028', NULL, 32, '抖音购买成功通知', '富茂', '您已成功购买[${name}],可在“抖音app>我>右上角≡>我的订单>查看全部”,务必到店之后进行核销,谨防上当受骗。', '2022-03-28 17:57:59', 1, 0, NULL, NULL, 0, 1, 0, 'SMS_236560256'); + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index 74d6f3951..a67d7eac8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -46,6 +46,8 @@ public class WxAppinfo extends BaseTenantEntity { private Integer enable; @io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat") private Integer plat; + @io.swagger.annotations.ApiModelProperty(value="小程序链接",name="sortUrl") + private String sortUrl; public WxAppinfo(){} public WxAppinfo(Integer mouldType){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 818210197..450cc0b87 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1877,14 +1877,16 @@ public class WxOrderServiceImpl implements WxOrderService { private void sendMsgAfterCouponOrderSuccess(WxOrder order,WxCoupon coupon, WxCUserBasicInfo user) { // 发送短信 -// if(EnumPayWay.PAY_WAY_TT.getCode().equals(order.getPayVendor())){ + if(EnumPayWay.PAY_WAY_TT.getCode().equals(order.getPayVendor())){ logger.info("订单成功短信通知start"); + WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(order, EnumPayWay.PAY_WAY_TT.getPlat()); //券名 String name = coupon.getTitle(); //找出用户手机号 String phone = user.getPhone(); Map msgReplaceMap = new HashMap(); msgReplaceMap.put("name", name); + msgReplaceMap.put("sortUrl",cAppInfo.getSortUrl()); WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.updateTenantInfo(order); @@ -1894,7 +1896,7 @@ public class WxOrderServiceImpl implements WxOrderService { wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("订单成功短信通知end"); -// } + } } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 5c5efe405..5b7bdefcc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -757,24 +757,24 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Override public void actionAfterCouponOrder(WxCouponOrder couponOrder, WxOrder rOrder, WxCoupon coupon, WxCUserBasicInfo user) { // 发送短信 -// if(EnumPayWay.PAY_WAY_TT.getCode().equals(couponOrder.getPayVendor())){ - logger.info("订单成功短信通知start"); - //券名 - String name = coupon.getTitle(); - //找出用户手机号 - String phone = user.getPhone(); - Map msgReplaceMap = new HashMap(); - msgReplaceMap.put("name", name); - - WxMsgRecord wxMsgRecord = new WxMsgRecord(); - wxMsgRecord.updateTenantInfo(couponOrder); - wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_REFUND.getCode()); - wxMsgRecord.setReceiver(phone); - wxMsgRecord.setDynamicContentMap(msgReplaceMap); - mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - logger.info("订单成功短信通知end"); -// } + if(EnumPayWay.PAY_WAY_TT.getCode().equals(couponOrder.getPayVendor())){ + logger.info("订单成功短信通知start"); + //券名 + String name = coupon.getTitle(); + //找出用户手机号 + String phone = user.getPhone(); + Map msgReplaceMap = new HashMap(); + msgReplaceMap.put("name", name); + + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.updateTenantInfo(couponOrder); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_REFUND.getCode()); + wxMsgRecord.setReceiver(phone); + wxMsgRecord.setDynamicContentMap(msgReplaceMap); + mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + logger.info("订单成功短信通知end"); + } } diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index 9760c9125..92e08271c 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -20,6 +20,7 @@ + @@ -27,7 +28,7 @@ `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`, `secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`, - `pay_id`,`type`,`mould_type`,`pay_bill_id`,`enable`,`plat` + `pay_id`,`type`,`mould_type`,`pay_bill_id`,`enable`,`plat`,`sort_url`