Commit b14347d1 by shuhu.hou

微信订单上传,订单状态修改

parent 7952ca86
...@@ -176,8 +176,8 @@ public class OrderCallBackMQService { ...@@ -176,8 +176,8 @@ public class OrderCallBackMQService {
wechatReportOrderDto.setOutTradeNo(orderExtInfoDto.getPayTransId()); wechatReportOrderDto.setOutTradeNo(orderExtInfoDto.getPayTransId());
wechatReportOrderDto.setTotalAmount(orderInfoReqs.getOriginalAmount().intValue()); wechatReportOrderDto.setTotalAmount(orderInfoReqs.getOriginalAmount().intValue());
wechatReportOrderDto.setDiscountAmount(orderInfoReqs.getSettlementAmount().intValue()); wechatReportOrderDto.setDiscountAmount(orderInfoReqs.getSettlementAmount().intValue());
//订单状态 (CREATE_DEAL—用户下单;PAY_SUCCESS—支付完成) //订单状态 (2—用户下单;1—支付完成)
wechatReportOrderDto.setStatus(NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState()) ? "CREATE_DEAL" : "PAY_SUCCESS"); wechatReportOrderDto.setStatus(NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState()) ? 2 : 1);
List<WechatReportOrderDto.DishInfo> list = new ArrayList<>(); List<WechatReportOrderDto.DishInfo> list = new ArrayList<>();
for (OrderItemResp item : orderInfoReqs.getOrderItemList()) { for (OrderItemResp item : orderInfoReqs.getOrderItemList()) {
......
...@@ -69,7 +69,7 @@ public class WechatReportOrderDto { ...@@ -69,7 +69,7 @@ public class WechatReportOrderDto {
/** /**
* 订单状态 (CREATE_DEAL—用户下单;PAY_SUCCESS—支付完成) * 订单状态 (CREATE_DEAL—用户下单;PAY_SUCCESS—支付完成)
*/ */
private String status; private Integer status;
/** /**
* 微信支付订单号(status 为 PAY_SUCCESS时必填) * 微信支付订单号(status 为 PAY_SUCCESS时必填)
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment