Ver código fonte

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xhxu 3 anos atrás
pai
commit
6ebede1813
6 arquivos alterados com 32 adições e 30 exclusões
  1. BIN
      mallinkAdmin/src/main/resources/doc/抖音小程序/富茂抖音小城操作流程SOP.docx
  2. +3
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java
  4. +16
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  5. +11
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

BIN
mallinkAdmin/src/main/resources/doc/抖音小程序/富茂抖音小城操作流程SOP.docx Ver arquivo


+ 3
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java Ver arquivo

@@ -343,7 +343,8 @@ public class WxCarETCPCallBackController extends BaseController {
WxPark park = wxParkService.getByObj(parkQ);
if (park == null) {
logger.error("etcpParkInCallback: ETCP车场未找到" + etcpParkId);
throw new MallinkException(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId);
//throw new MallinkException(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId);
return true;
} else {
wxCarCmdLog.updateTenantInfo(park);
}
@@ -460,6 +461,7 @@ public class WxCarETCPCallBackController extends BaseController {
if (park == null) {
logger.error("etcpParkOutCallback: ETCP车场未找到 " + etcpParkId);
// return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId);
return true;
} else {
tenantId = park.getTenantId();
wxCarCmdLog.updateTenantInfo(park);


+ 1
- 1
mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java Ver arquivo

@@ -86,7 +86,7 @@ public class AliyunOSS {
if(null != result){
log.info("==========>OSS文件上传成功,OSS地址:"+fileUrl);
//JPG的加上压缩
if (suffix.equals("JPG") || suffix.equals("jpg")) {
if (suffix.equals(".JPG") || suffix.equals(".jpg")) {
return aliyunOSSConfig.getFiledomain() + "/" + fileUrl+"?x-oss-process=image/resize,w_10000/quality,q_60";
}else {
return aliyunOSSConfig.getFiledomain() + "/" + fileUrl;


+ 16
- 16
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Ver arquivo

@@ -2008,22 +2008,22 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
/**
* 检查 小程序模板消息是否超限
*/
WxMsgLimit msgLimit = new WxMsgLimit();
msgLimit.updateTenantInfo(merchant);
msgLimit.setType(formType);
msgLimit.setLimitId(formId);
if (wxMsgLimitService.checkIsLimit(msgLimit)) {
// 已达到限制条件,不发消息了
logger.error("已达到限制条件,不发小程序模板消息了: " + user.getId());
return;
}
if (bUsed) {
//mq发送小程序消息 - 核销成功消息
doVerifySuccessMsg(couponOrder, formId, coupon, merchant, user, dateFormat, couponDetail, gotopage);
} else {
// mq发送小程序消息 - 核销失败消息
doVerifyFailMsg(couponOrder, formId, coupon, user, dateFormat, couponDetail, gotopage);
}
// WxMsgLimit msgLimit = new WxMsgLimit();
// msgLimit.updateTenantInfo(merchant);
// msgLimit.setType(formType);
// msgLimit.setLimitId(formId);
// if (wxMsgLimitService.checkIsLimit(msgLimit)) {
// // 已达到限制条件,不发消息了
// logger.error("已达到限制条件,不发小程序模板消息了: " + user.getId());
// return;
// }
// if (bUsed) {
// //mq发送小程序消息 - 核销成功消息
// doVerifySuccessMsg(couponOrder, formId, coupon, merchant, user, dateFormat, couponDetail, gotopage);
// } else {
// // mq发送小程序消息 - 核销失败消息
// doVerifyFailMsg(couponOrder, formId, coupon, user, dateFormat, couponDetail, gotopage);
// }


}


+ 11
- 11
mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java Ver arquivo

@@ -196,17 +196,17 @@ public class WxOrderPressServiceImpl implements WxOrderPressService {
/**
* 检查 小程序模板消息是否超限
*/
WxMsgLimit msgLimit = new WxMsgLimit();
msgLimit.updateTenantInfo(user);
msgLimit.setType(formType);
msgLimit.setLimitId(formId);
if(wxMsgLimitService.checkIsLimit(msgLimit)) {
// 已达到限制条件,不发消息了
logger.error("已达到限制条件,不发小程序模板消息了: " + user.getId());
return;
}
// mq发送小程序消息 - 核销成功消息
doPressSuccessMsg(coupon, user, formId, gotopage);
// WxMsgLimit msgLimit = new WxMsgLimit();
// msgLimit.updateTenantInfo(user);
// msgLimit.setType(formType);
// msgLimit.setLimitId(formId);
// if(wxMsgLimitService.checkIsLimit(msgLimit)) {
// // 已达到限制条件,不发消息了
// logger.error("已达到限制条件,不发小程序模板消息了: " + user.getId());
// return;
// }
// // mq发送小程序消息 - 核销成功消息
// doPressSuccessMsg(coupon, user, formId, gotopage);
}

private void doPressSuccessMsg(WxCoupon coupon, WxCUser user, String formId, String gotopage) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Ver arquivo

@@ -1595,7 +1595,7 @@ public class WxOrderServiceImpl implements WxOrderService {
//发订阅消息
sendCouponRemind(couponOrder,coupon, cuser);
// 发送微信模板消息(公众号模板消息/小程序统一消息/小程序模板消息)
sendMpMsgForSendCoupon(couponOrder,coupon, cuser);
//sendMpMsgForSendCoupon(couponOrder,coupon, cuser);
}
}
}


Carregando…
Cancelar
Salvar