diff --git a/mallinkAdmin/src/main/resources/doc/抖音小程序/富茂抖音小城操作流程SOP.docx b/mallinkAdmin/src/main/resources/doc/抖音小程序/富茂抖音小城操作流程SOP.docx index 821df399d..fe7dbfad7 100644 Binary files a/mallinkAdmin/src/main/resources/doc/抖音小程序/富茂抖音小城操作流程SOP.docx and b/mallinkAdmin/src/main/resources/doc/抖音小程序/富茂抖音小城操作流程SOP.docx differ diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java index 51bae65a3..d46021818 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java @@ -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); diff --git a/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java b/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java index 73a3c15c9..bc1fc6b77 100644 --- a/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java +++ b/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java @@ -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; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 41ba881d9..fc77a6117 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -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); +// } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java index 50d9af0e9..62bd24405 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java @@ -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) { 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 b87fe3b16..8815a1149 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1595,7 +1595,7 @@ public class WxOrderServiceImpl implements WxOrderService { //发订阅消息 sendCouponRemind(couponOrder,coupon, cuser); // 发送微信模板消息(公众号模板消息/小程序统一消息/小程序模板消息) - sendMpMsgForSendCoupon(couponOrder,coupon, cuser); + //sendMpMsgForSendCoupon(couponOrder,coupon, cuser); } } }