Преглед изворни кода

fix bug

release_toaliyun_real
zhengfangyuan пре 3 година
родитељ
комит
912d447c47
3 измењених фајлова са 14 додато и 3 уклоњено
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java
  3. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Прегледај датотеку

@@ -651,7 +651,7 @@ public class WxCouponController extends BaseController {
public ResultData couponMerchantAutoShare(@RequestBody WxCoupon wxCoupon) { public ResultData couponMerchantAutoShare(@RequestBody WxCoupon wxCoupon) {
wxCoupon.updateTenantInfo(getTenantInfo()); wxCoupon.updateTenantInfo(getTenantInfo());
try { try {
Map<Long, Boolean> map = wxCouponService.couponMerchantAutoShare(wxCoupon,wxCoupon);
Map<Long, Boolean> map = wxCouponService.couponMerchantAutoShare(wxCoupon);
return new ResultData(map); return new ResultData(map);
} catch (Exception e) { } catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage()); return new ResultData(Result.ERROR,e.getMessage());
@@ -667,7 +667,7 @@ public class WxCouponController extends BaseController {
wxCoupon.setTenantId(tenantEntity.getParentTenantId()); wxCoupon.setTenantId(tenantEntity.getParentTenantId());
wxCoupon.setParentTenantId(null); wxCoupon.setParentTenantId(null);
try { try {
Map<Long, Boolean> map = wxCouponService.couponMerchantAutoShare(tenantEntity,wxCoupon);
Map<Long, Boolean> map = wxCouponService.couponMerchantAutoShare(wxCoupon);
return new ResultData(map); return new ResultData(map);
} catch (Exception e) { } catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage()); return new ResultData(Result.ERROR,e.getMessage());


+ 6
- 0
mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java Прегледај датотеку

@@ -141,4 +141,10 @@ public enum EnumCouponType {
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "券平台错误,未找到对应类型"); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "券平台错误,未找到对应类型");
} }


public static boolean isParentCoupon(Integer couponType) {
if (couponType == COUPON_DOUYIN_PLAT.getCode() || couponType == COUPON_DOUYIN_BRAND.getCode()) {
return true;
}
return false;
}
} }

+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Прегледај датотеку

@@ -1498,7 +1498,12 @@ public class WxCouponServiceImpl implements WxCouponService {
} }
EnumAppPlat plat = EnumCouponType.getAppPlat(couponType); EnumAppPlat plat = EnumCouponType.getAppPlat(couponType);
EnumPayWay payWay = EnumAppPlat.getPayWay(plat); EnumPayWay payWay = EnumAppPlat.getPayWay(plat);
WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(tenantEntity,plat);
WxAppinfo cAppInfo = null;
if (EnumCouponType.isParentCoupon(couponType)) {
cAppInfo = wxAppinfoService.getCAppInfo(wxCoupon,plat);
}else {
cAppInfo = wxAppinfoService.getCAppInfo(tenantEntity,plat);
}
if (cAppInfo == null) { if (cAppInfo == null) {
throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND);
} }


Loading…
Откажи
Сачувај