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

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

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
2e4cc8ec2d
5 измененных файлов: 20 добавлений и 4 удалений
  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. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  5. +9
    -0
      mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java

+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java Просмотреть файл

@@ -40,7 +40,12 @@ public class WxAppinfoServiceImpl implements WxAppinfoService {
public WxAppinfo getCAppInfo(TenantEntity tenantEntity,EnumPayWay payWay) {
WxAppinfo appInfo = null;
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.setType(EnumAppType.C.getCode());
List<WxAppinfo> appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ));


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

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


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -1575,7 +1575,7 @@ public class WxOrderServiceImpl implements WxOrderService {
try {
stockBack(updateOrder);
} catch (Exception e) {
logger.error("库存+1失败, e:" + e.getMessage());
logger.error("库存+1失败, e:" + e.getMessage(),e);
throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL);
}
break;
@@ -1586,11 +1586,12 @@ public class WxOrderServiceImpl implements WxOrderService {
refOrder.setId(updateOrder.getId());
refOrder.setOrderStatus(enumOrderStatus.getCode());
refOrder.setUpdateDate(currentDate);
refOrder.updateTenantInfo(updateOrder);
int ret = 0;
try {
ret = wxOrderMapper.updateById(refOrder);
} catch (Exception e) {
logger.error("订单状态更新失败, e:" + e.getMessage());
logger.error("订单状态更新失败, e:" + e.getMessage(),e);
throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR);
}
return ret;


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

@@ -531,7 +531,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
wxOrderService.updateOrderStatus(order, EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS);
}
} catch (Exception e) {
logger.error(e.getMessage());
logger.error(e.getMessage(),e);
throw new MallinkException(ErrorCode.DB_FAIL);
}



+ 9
- 0
mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java Просмотреть файл

@@ -63,6 +63,15 @@ public class PayServiceFactory {
shareMap.put(EnumPayWay.PAY_WAY_WECHAT.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_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;
}


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