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

fix order

release_toaliyun_real
xiaohanzi 4 лет назад
Родитель
Сommit
73d18311a8
2 измененных файлов: 7 добавлений и 5 удалений
  1. +4
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java

+ 4
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Просмотреть файл

@@ -136,10 +136,10 @@ public class WxPayOrderController extends BaseController {
record.setComposeOrder(Integer.parseInt(composeOrderType));
return wxPayOrderService.createPayOrder(appInfo, wxCUserBasicInfo, record, payWay,parm);
} catch (MallinkException e) {
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage());
}
}
@@ -229,10 +229,10 @@ public class WxPayOrderController extends BaseController {
}
return new ResultData(Result.SUCCESS, "支付状态更新成功");
} catch (MallinkException e) {
logger.error("支付状态更新失败2: " + payOrder.toString() + ", e:" + e.getMessage());
logger.error("支付状态更新失败2: " + payOrder.toString() + ", e:" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage());
logger.error("支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage(),e);
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage());
}
}


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

@@ -52,7 +52,9 @@ public class SingleOrderAdapterService implements OrderAdapterService {

@Override
public List<WxOrder> getChildOrders(WxComposeOrder composeOrder, String tenantId) {
return null;
List<WxOrder> childOrders = new ArrayList<WxOrder>();
childOrders.add(composeOrder.getSingleOrder());
return childOrders;
}

@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})


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