Просмотр исходного кода

Merge remote-tracking branch 'origin/release_toaliyun_real_202208' into release_toaliyun_real_202208

# Conflicts:
#	mallinkService/src/main/java/com/iformall/mapper/WxPayAccountMapper.java
release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
a69b7b9902
5 измененных файлов: 17 добавлений и 2 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxAppinfoService.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxCouponService.java
  3. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
  4. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  5. +1
    -1
      mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java

+ 3
- 0
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);
/**
* 保存或更新实体
*


+ 1
- 0
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;


+ 7
- 0
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);
}
}

}

+ 5
- 1
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;


+ 1
- 1
mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java Просмотреть файл

@@ -53,7 +53,7 @@ public class TtOrderExpiringSchedule {
List<WxAppinfo> 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) {


Загрузка…
Отмена
Сохранить