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

Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211

release_toaliyun_real
zhengfangyuan 3 лет назад
Родитель
Сommit
c70d90cbc4
5 измененных файлов: 12 добавлений и 6 удалений
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/douyin/web/config/TtWebConstants.java
  5. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 3
- 3
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:服务商模式(默认服务商模式)
}


+ 1
- 1
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()) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java Просмотреть файл

@@ -235,7 +235,7 @@ public class TtWebServiceImpl implements TtWebService, RequestHttp<CloseableHttp
/*
* 发生以下情况时尝试刷新access_token
*/
if (error.getErrorCode() == ERR_2190008) {
if (error.getErrorCode() == ERR_200104 || error.getErrorCode() == ERR_2190008) {
// 强制设置WxMaConfig的access token过期了,这样在下一次请求里就会刷新access token
this.getTtWebConfig().expireAccessToken();
if (this.getTtWebConfig().autoRefreshToken()) {


+ 3
- 0
mallinkService/src/main/java/com/iformall/douyin/web/config/TtWebConstants.java Просмотреть файл

@@ -16,7 +16,10 @@ public class TtWebConstants {
public static final class ErrorCode {
/**
* 200104 token已过期
*
* 2190008 token已过期
*/
public static final int ERR_200104 = 200104;
public static final int ERR_2190008 = 2190008;

}


+ 4
- 1
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<Integer> types = wxCoupon.getTypes();
List<Integer> 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());


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