diff --git a/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java b/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java index 9d4f6ae28..3123d1d9c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxProjectConfig; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAppPlat; @@ -66,6 +67,8 @@ public interface WxAppinfoService { WxAppinfo getBAppInfo(TenantEntity tenantEntity,EnumAppPlat appPlat); + WxAppinfo getCouponAppInfo(WxCoupon coupon); + /** * 保存或更新实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 59eb94372..486c62be9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.TtCouponChannelPoi; +import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.TtCouponVo; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java index 71b30937c..3823f0930 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxProjectConfig; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumAppPlat; @@ -72,6 +73,11 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { return appInfo; } + @Override + public WxAppinfo getCouponAppInfo(WxCoupon coupon) { + return 111111111111111111; + } + @Override public WxAppinfo getByAppId(String appId) { return wxAppinfoMapper.findByAppId(appId); @@ -208,4 +214,5 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { RedisCacheUtils.removeCache(wxAppinfoRedisTemplate, key4); } } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index c449ce6c9..14c7dfb15 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1216,7 +1216,11 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public boolean validCouponDate(WxCoupon wxCoupon) { EnumPayShare isShare = EnumPayShare.NO; - WxPayAccount payAccount = payAccountMapper.getByTenantId(wxCoupon.getTenantId()); + WxAppinfo appinfo = wxAppinfoService.getCouponAppInfo(wxCoupon); + if (null == appinfo) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(), "券未查询到appInfo"); + } + WxPayAccount payAccount = payAccountMapper.selectById(appinfo.getPayId()); EnumPayShare paySHareEnum = EnumPayShare.getEnum(payAccount.getShare()); if (paySHareEnum != null) { isShare = paySHareEnum; diff --git a/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java b/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java index f966c34ff..8bc199a20 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java @@ -53,7 +53,7 @@ public class TtOrderExpiringSchedule { List wxAppinfoList = wxAppinfoService.getList(appQ); for (WxAppinfo wxAppinfo:wxAppinfoList) { wxAppinfoMap.put(wxAppinfo.getFinalTenantId(),wxAppinfo);//一个集团一个小程序 - wxPayAccountMap.put(wxAppinfo.getFinalTenantId(),payAccountService.getById(wxAppinfo.getId())); + wxPayAccountMap.put(wxAppinfo.getFinalTenantId(),payAccountService.getById(wxAppinfo.getPayId())); } for (TtOrder order:orderList) {