diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 268e9f51a..b9739d2b4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -249,9 +249,9 @@ public class WxProjectConfigController extends BaseController { if(StringUtils.isBlank(wxPayAccount.getNotifyUrl())){ wxPayAccount.setNotifyUrl(wechatWebProperties.getUrl()+"/wxPay/notify"); } - if(StringUtils.isBlank(wxPayAccount.getCertPath())){ - wxPayAccount.setCertPath("/opt/iformall/service/apiclient_cert.p12"); - } +// if(StringUtils.isBlank(wxPayAccount.getCertPath())){ +// wxPayAccount.setCertPath("/opt/iformall/service/apiclient_cert.p12"); +// } if(wxPayAccount.getType() == null){ wxPayAccount.setType(1);//0:普通商户模式, 1:服务商模式(默认服务商模式) } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 2a49d38eb..09d871f7e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -651,7 +651,7 @@ public class WxRentContractController extends WxContractBaseController { }else if (rentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NEW_SHOP_CONTRACT, EnumFlowContractType.RENT_POINT, wxRentContract.getRemark(), wxRentContract.getId(),null)); } - }else if(rentContract.getOperationType().intValue() == EnumContractOperationType.PART.getCode().intValue()){ + }else if(rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()){ if (rentContract.getRentShopType().intValue() == EnumRentShopType.SHOP.getCode().intValue()) { rentContract.setFlowParams(generateFlowParams(EnumFlowKey.NNEW_RENT_CONTRACT, EnumFlowContractType.WHOLE_SHOP, wxRentContract.getRemark(), wxRentContract.getId(),wxRentContract.getPropertyId())); }else if (rentContract.getRentShopType().intValue() == EnumRentShopType.POINT.getCode().intValue()) { diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java index d33dd5514..160590bb5 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java @@ -235,7 +235,7 @@ public class TtWebServiceImpl implements TtWebService, RequestHttp types = wxCoupon.getTypes(); + List types = new ArrayList<>(); + if(wxCoupon.getTypes() != null && !wxCoupon.getTypes().isEmpty()){ + types.addAll(wxCoupon.getTypes()); + } if(wxCoupon.getTargetAd() != null){ if(wxCoupon.getPlat() == null){ wxCoupon.setPlat(EnumCouponChannelType.getAppPlat(wxCoupon.getTargetAd()).getCode());