Browse Source

//..notice

release_toaliyun_real
xhxu 2 years ago
parent
commit
060b808c23
6 changed files with 77 additions and 20 deletions
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantRelationMapper.java
  4. +50
    -17
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  5. +11
    -0
      mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml
  6. +9
    -3
      mallinkService/src/main/resources/mapper/WxMerchantRelationMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java View File

@@ -41,6 +41,8 @@ public enum EnumMsgModel {

COUPON_ORDER_SUCCESS(32,"购买成功提醒"),
COUPON_ORDER_REFUND(33,"提交退款提醒"),

COUPON_ORDER_RESERVATION_SUCCESS(34,"预约成功提醒"),
;

public static EnumMsgModel getEnum(Integer code) {


+ 3
- 0
mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java View File

@@ -25,4 +25,7 @@ public interface WxMerchantBUserMapper extends CommonMapper<WxMerchantBUser, Lon
int addOtherMerchant(@Param("tenantId")String tenantId, @Param("ids")List<Long> ids, @Param("otherId")String otherId);
void deleteByMerchantId(@Param("tenantId")String tenantId, @Param("merchantId")Long merchantId);

List<String> findAdminPhone(@Param("merchantIds")List<Long> merchantIds);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxMerchantRelationMapper.java View File

@@ -24,5 +24,7 @@ public interface WxMerchantRelationMapper extends CommonMapper<WxMerchantRelatio

List<Long> getRelationByRegionId(@Param("regionId") Long regionId);

List<Long> getRegionMerchantId(@Param("merchantId") Long merchantId);

List<WxMerchantRelation> getInfByRegionId(@Param("id") Long id);
}

+ 50
- 17
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -248,6 +248,9 @@ public class WxOrderServiceImpl implements WxOrderService {

@Autowired
private WxCouponOrderReservationMapper wxCouponOrderReservationMapper;

@Autowired
private WxMerchantRelationMapper wxMerchantRelationMapper;
@Override
@@ -1519,6 +1522,7 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setCreateDate(curr);
record.setUpdateDate(curr);
wxCouponOrderReservationMapper.insert(record);

}
}
}catch(Exception e){
@@ -2234,21 +2238,21 @@ public class WxOrderServiceImpl implements WxOrderService {
* @param user
*/
public void actionAfterCouponOrderSuccess(WxOrder order, WxCoupon coupon, WxCUserBasicInfo user) {
WxCouponOrder couponOrderQ = new WxCouponOrder();
couponOrderQ.setOrderId(order.getId());
couponOrderQ.updateTenantInfo(order);
List<WxCouponOrder> couponorderlist = wxCouponOrderMapper.findList(couponOrderQ);
WxCouponOrder couponOrder = null;
if (null != couponorderlist && couponorderlist.size() > 0 ) {
couponOrder = couponorderlist.get(0);
}


if(EnumCouponType.COUPON_GIFT.getCode().equals(coupon.getType())){
WxCouponOrder couponOrderQ = new WxCouponOrder();
couponOrderQ.setOrderId(order.getId());
couponOrderQ.setCouponId(coupon.getId());
couponOrderQ.updateTenantInfo(order);
List<WxCouponOrder> couponorderlist = wxCouponOrderMapper.findList(couponOrderQ);
if (null != couponorderlist && couponorderlist.size() > 0 ) {
WxCouponOrder couponOrder = couponorderlist.get(0);
try {
wxCouponOrderService.verify(couponOrder,null,EnumCouponVerifyType.VERIFY_AUTO,null);
} catch (Exception e) {
logger.error("系统券包核销异常:" + e.getMessage(),e);
}
try {
wxCouponOrderService.verify(couponOrder,null,EnumCouponVerifyType.VERIFY_AUTO,null);
} catch (Exception e) {
logger.error("系统券包核销异常:" + e.getMessage(),e);
}
}

@@ -2267,18 +2271,18 @@ public class WxOrderServiceImpl implements WxOrderService {
} catch (Exception e) {
logger.error("订单发券:" + e.getMessage(),e);
}
//通知用户
//通知
try {
sendMsgAfterCouponOrderSuccess(order,coupon,user);
sendMsgAfterCouponOrderSuccess(order,couponOrder,coupon,user);
} catch (Exception e) {
logger.error("订单成功通知用户error:" + e.getMessage(),e);
logger.error("订单成功通知error:" + e.getMessage(),e);
}
//同步订单
sendInsideOrderPushMsg(order,order.getComposeOrderId(),null);
}

private void sendMsgAfterCouponOrderSuccess(WxOrder order,WxCoupon coupon, WxCUserBasicInfo user) {
// 发送短信
private void sendMsgAfterCouponOrderSuccess(WxOrder order,WxCouponOrder couponOrder,WxCoupon coupon, WxCUserBasicInfo user) {
// 通知用户
if(EnumPayWay.PAY_WAY_TT.getCode().equals(order.getPayVendor())){
logger.info("订单成功短信通知start");
WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(order, EnumPayWay.PAY_WAY_TT.getPlat());
@@ -2299,6 +2303,35 @@ public class WxOrderServiceImpl implements WxOrderService {
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
logger.info("订单成功短信通知end");
}

if(EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode().equals(coupon.getType())){
logger.info("订单预约短信通知start");
WxCouponOrderReservation couponOrderReservation = wxCouponOrderReservationMapper.getSortByCouponOrder(couponOrder.getId(), couponOrder.getTenantId());
if(couponOrderReservation == null || couponOrderReservation.getReservationMerchantId() == null){
return;
}

List<Long> merchantIds = new ArrayList();
merchantIds.add(couponOrderReservation.getReservationMerchantId());
List<Long> regionMerchantIds = wxMerchantRelationMapper.getRegionMerchantId(couponOrderReservation.getReservationMerchantId());
if(!regionMerchantIds.isEmpty()){
merchantIds.addAll(regionMerchantIds);
}
List<String> phones = wxMerchantBUserMapper.findAdminPhone(merchantIds);
if(phones.isEmpty()){
return;
}
String toPhone = phones.stream().collect(Collectors.joining(","));

WxMsgRecord wxMsgRecord = new WxMsgRecord();
wxMsgRecord.updateTenantInfo(order);
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_RESERVATION_SUCCESS.getCode());
wxMsgRecord.setReceiver(toPhone);
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
logger.info("订单预约短信通知end");
}

}

@Override


+ 11
- 0
mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml View File

@@ -194,4 +194,15 @@
delete from wx_merchant_b_user where `tenant_id` = #{tenantId} and `merchant_id` = #{merchantId}
</delete>


<select id="findAdminPhone" resultType="java.lang.String">
select phone
from wx_merchant_b_user
where `is_admin` = 1
and merchant_id in
<foreach collection="merchantIds" index="index" item="merchantIdItem" open="(" separator="," close=")">
#{merchantIdItem}
</foreach>
</select>

</mapper>

+ 9
- 3
mallinkService/src/main/resources/mapper/WxMerchantRelationMapper.xml View File

@@ -76,9 +76,15 @@
merchant_id
from wx_merchant_relation
where is_del = 0
<if test="regionId != null and regionId != ''">
and region_merchant_id = #{regionId}
</if>
and region_merchant_id = #{regionId}
</select>

<select id="getRegionMerchantId" resultType="java.lang.Long">
select
region_merchant_id
from wx_merchant_relation
where is_del = 0
and merchant_id = #{merchantid}
</select>

<select id="getInfByRegionId" resultType="com.iformall.domain.po.WxMerchantRelation">


Loading…
Cancel
Save