ufo / yohoufo-fore · Commits

Go to a project

Authored by Lixiaodi
Commit b2ed8489ad6f97a8d5c4d0eb756fff637c3bc11d 2 parents baef2c4e d50ec8b6

Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev

Inline Side-by-side
Showing 6 changed files with 18 additions and 7 deletions
1 package com.yohoufo.dal.order.model; 1 package com.yohoufo.dal.order.model;
2 2
  3 +import com.alibaba.fastjson.JSONObject;
  4 +
3 import java.math.BigDecimal; 5 import java.math.BigDecimal;
4 6
5 public class SellerOrder { 7 public class SellerOrder {
@@ -137,4 +139,9 @@ public class SellerOrder { @@ -137,4 +139,9 @@ public class SellerOrder {
137 public void setExceptStatus(Integer exceptStatus) { 139 public void setExceptStatus(Integer exceptStatus) {
138 this.exceptStatus = exceptStatus; 140 this.exceptStatus = exceptStatus;
139 } 141 }
  142 +
  143 + @Override
  144 + public String toString() {
  145 + return JSONObject.toJSONString(this);
  146 + }
140 } 147 }
@@ -69,6 +69,9 @@ public class PaymentController { @@ -69,6 +69,9 @@ public class PaymentController {
69 @RequestParam(name = "payment") int payment){ 69 @RequestParam(name = "payment") int payment){
70 70
71 PaymentRequest request = PaymentRequest.builder().uid(uid).orderCode(orderCode).payment(payment).build(); 71 PaymentRequest request = PaymentRequest.builder().uid(uid).orderCode(orderCode).payment(payment).build();
  72 +
  73 + logger.info("method com.yohoufo.order.controller.PaymentController.pay in, request is {}", request);
  74 +
72 PrepayResponse paymentResponse = paymentService.payment(request); 75 PrepayResponse paymentResponse = paymentService.payment(request);
73 if (paymentResponse.getPrepayResult() == PrepayResponse.FAILED){ 76 if (paymentResponse.getPrepayResult() == PrepayResponse.FAILED){
74 return new ApiResponse.ApiResponseBuilder().code(PrepayResponse.FAILED).data(paymentResponse.getJsonObj()).message("支付订单失败").build(); 77 return new ApiResponse.ApiResponseBuilder().code(PrepayResponse.FAILED).data(paymentResponse.getJsonObj()).message("支付订单失败").build();
@@ -17,6 +17,7 @@ import org.slf4j.Logger; @@ -17,6 +17,7 @@ import org.slf4j.Logger;
17 import org.slf4j.LoggerFactory; 17 import org.slf4j.LoggerFactory;
18 import org.springframework.beans.factory.annotation.Autowired; 18 import org.springframework.beans.factory.annotation.Autowired;
19 import org.springframework.stereotype.Controller; 19 import org.springframework.stereotype.Controller;
  20 +import org.springframework.web.bind.annotation.RequestBody;
20 import org.springframework.web.bind.annotation.RequestMapping; 21 import org.springframework.web.bind.annotation.RequestMapping;
21 import org.springframework.web.bind.annotation.RequestParam; 22 import org.springframework.web.bind.annotation.RequestParam;
22 import org.springframework.web.bind.annotation.ResponseBody; 23 import org.springframework.web.bind.annotation.ResponseBody;
@@ -123,7 +124,7 @@ public class SellerOrderController { @@ -123,7 +124,7 @@ public class SellerOrderController {
123 * 后台下架 124 * 后台下架
124 * 在遥远的未来或者根本就没有未来 125 * 在遥远的未来或者根本就没有未来
125 * 那就用"也许"来表达下，未来也许需要MQ方式 126 * 那就用"也许"来表达下，未来也许需要MQ方式
126 - * @param skup 127 + * @param sellerOrder
127 * @return 128 * @return
128 * @throws GatewayException 129 * @throws GatewayException
129 */ 130 */
@@ -131,7 +132,7 @@ public class SellerOrderController { @@ -131,7 +132,7 @@ public class SellerOrderController {
131 @ResponseBody 132 @ResponseBody
132 @IgnoreSession 133 @IgnoreSession
133 @IgnoreSignature 134 @IgnoreSignature
134 - public ApiResponse offShelveByErp(SellerOrder sellerOrder) throws GatewayException { 135 + public ApiResponse offShelveByErp(@RequestBody SellerOrder sellerOrder) throws GatewayException {
135 136
136 logger.info("in ufo.sellerOrder.cancel, sellerOrder {}", sellerOrder); 137 logger.info("in ufo.sellerOrder.cancel, sellerOrder {}", sellerOrder);
137 boolean result = sellerOrderService.offShelveByErp(sellerOrder.getSkup()) ; 138 boolean result = sellerOrderService.offShelveByErp(sellerOrder.getSkup()) ;
@@ -82,7 +82,7 @@ public class SellerOrderPaymentService extends AbstractOrderPaymentService { @@ -82,7 +82,7 @@ public class SellerOrderPaymentService extends AbstractOrderPaymentService {
82 82
83 @Override 83 @Override
84 public void processAfterPay(OrderInfo orderInfo) { 84 public void processAfterPay(OrderInfo orderInfo) {
85 - 85 + logger.info("method com.yohoufo.order.service.SellerOrderPaymentService.processAfterPay in, orderInfo is {}", orderInfo);
86 String prdName = null; 86 String prdName = null;
87 SellerOrder sellerOrder = sellerOrderMapper.selectByOrderCode(orderInfo.getOrderCode()); 87 SellerOrder sellerOrder = sellerOrderMapper.selectByOrderCode(orderInfo.getOrderCode());
88 if (Objects.nonNull(sellerOrder)){ 88 if (Objects.nonNull(sellerOrder)){
@@ -8,12 +8,12 @@ consumer: @@ -8,12 +8,12 @@ consumer:
8 topic: ufo.order.updateExpressInfo 8 topic: ufo.order.updateExpressInfo
9 9
10 - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer 10 - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
11 - topic: seller_order_autoCancel 11 + topic: sellerOrder.autoCancel
12 delay: 12 delay:
13 interval: 15 13 interval: 15
14 14
15 - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer 15 - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
16 - topic: buyer_order_autoCancel 16 + topic: buyerOrder.autoCancel
17 delay: 17 delay:
18 interval: 15 18 interval: 15
19 19
@@ -8,12 +8,12 @@ consumer: @@ -8,12 +8,12 @@ consumer:
8 topic: ufo.order.updateExpressInfo 8 topic: ufo.order.updateExpressInfo
9 9
10 - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer 10 - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
11 - topic: seller_order_autoCancel 11 + topic: sellerOrder.autoCancel
12 delay: 12 delay:
13 interval: 15 13 interval: 15
14 14
15 - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer 15 - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
16 - topic: buyer_order_autoCancel 16 + topic: buyerOrder.autoCancel
17 delay: 17 delay:
18 interval: 15 18 interval: 15
19 19