From 7528f986a9c85e9e02f12b2e7a808cc410da2e4c Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Nov 2022 13:45:59 +0800 Subject: [PATCH 1/5] //config --- .../controller/basic/WxProjectConfigController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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:服务商模式(默认服务商模式) } From f5e08359c513fa36375275a1fbbf965e1f238f13 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Nov 2022 15:39:15 +0800 Subject: [PATCH 2/5] //coupon --- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 8d8144637..a456c470d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -235,7 +235,10 @@ public class WxCouponServiceImpl implements WxCouponService { wxCoupon.setPlat(EnumCouponType.getAppPlat(wxCoupon.getType()).getCode()); } }else{ - List 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()); From ededb6ea499b1dead828f3064275827f6b197b05 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Nov 2022 16:53:37 +0800 Subject: [PATCH 3/5] //rent --- .../iformall/controller/contract/WxRentContractController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()) { From 6db15e819616f8f1fcb694c2324722650c07f2a4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 17 Nov 2022 17:26:06 +0800 Subject: [PATCH 4/5] //web --- .../com/iformall/douyin/web/api/impl/TtWebServiceImpl.java | 2 +- .../java/com/iformall/douyin/web/config/TtWebConstants.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 Date: Thu, 17 Nov 2022 17:35:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?//=E5=90=88=E5=90=8C=20token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/contract/WxRentContractController.java | 2 +- .../com/iformall/douyin/web/api/impl/TtWebServiceImpl.java | 2 +- .../java/com/iformall/douyin/web/config/TtWebConstants.java | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) 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