Ver a proveniência

fix

release_toaliyun_real
xiaohanzi há 5 anos
ascendente
cometimento
5069733b92
3 ficheiros alterados com 16 adições e 1 eliminações
  1. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  3. +9
    -0
      mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java

+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java Ver ficheiro

@@ -40,7 +40,12 @@ public class WxAppinfoServiceImpl implements WxAppinfoService {
public WxAppinfo getCAppInfo(TenantEntity tenantEntity,EnumPayWay payWay) { public WxAppinfo getCAppInfo(TenantEntity tenantEntity,EnumPayWay payWay) {
WxAppinfo appInfo = null; WxAppinfo appInfo = null;
WxAppinfo appinfoQ = new WxAppinfo(); WxAppinfo appinfoQ = new WxAppinfo();
appinfoQ.setPlat(payWay.getPlat().getCode());
if (null == payWay.getPlat()) {
appinfoQ.setPlat(EnumPayWay.PAY_WAY_WECHAT.getPlat().getCode());
}else {
appinfoQ.setPlat(payWay.getPlat().getCode());
}
appinfoQ.updateTenantInfo(tenantEntity); appinfoQ.updateTenantInfo(tenantEntity);
appinfoQ.setType(EnumAppType.C.getCode()); appinfoQ.setType(EnumAppType.C.getCode());
List<WxAppinfo> appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ)); List<WxAppinfo> appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ));


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Ver ficheiro

@@ -621,6 +621,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); WxMerchantSubsidy subsidy = new WxMerchantSubsidy();
subsidy.setOrderId(couponOrder.getOrderId()); subsidy.setOrderId(couponOrder.getOrderId());
subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode());
subsidy.updateTenantInfo(couponOrder);
List<WxMerchantSubsidy> wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); List<WxMerchantSubsidy> wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy));
if (wmsList.size() > 0) { if (wmsList.size() > 0) {
logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId());


+ 9
- 0
mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java Ver ficheiro

@@ -63,6 +63,15 @@ public class PayServiceFactory {
shareMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxShareService); shareMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxShareService); shareMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_POS_NEU.getCode(), wxShareService); shareMap.put(EnumPayWay.PAY_WAY_POS_NEU.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_MERCHANT.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_BATCH_SEND.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_TRADE.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_PASSWD.getCode(), wxShareService);
shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT.getCode(), wxShareService);
} }
return shareMap; return shareMap;
} }


Carregando…
Cancelar
Guardar