|
@@ -18,7 +18,9 @@ import zs.payment.req.aftersales.AfterSalesOrderReq;
|
|
|
import zs.payment.req.aftersales.AfterSalesOrderTypeReq;
|
|
import zs.payment.req.aftersales.AfterSalesOrderTypeReq;
|
|
|
import zs.payment.resp.Result;
|
|
import zs.payment.resp.Result;
|
|
|
|
|
|
|
|
|
|
+import zs.payment.service.order.OrdersService;
|
|
|
import zs.payment.service.supply.paysupply.PaySupplyService;
|
|
import zs.payment.service.supply.paysupply.PaySupplyService;
|
|
|
|
|
+import zs.payment.utils.TimeUtils;
|
|
|
|
|
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
@@ -44,6 +46,12 @@ public class YxSupplyChannelManualController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private KafkaProducer kafkaProducer;
|
|
private KafkaProducer kafkaProducer;
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 芸信供应的中台订单
|
|
|
|
|
+ */
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private OrdersService ordersService;
|
|
|
|
|
+
|
|
|
//订单支付(单独下单之后使用这个支付)
|
|
//订单支付(单独下单之后使用这个支付)
|
|
|
@PostMapping("/orderPayOnly")
|
|
@PostMapping("/orderPayOnly")
|
|
|
public Result orderPayOnly(@Valid @RequestBody OrderPayReq req){
|
|
public Result orderPayOnly(@Valid @RequestBody OrderPayReq req){
|
|
@@ -90,6 +98,7 @@ public class YxSupplyChannelManualController {
|
|
|
OrderCallback callback = new OrderCallback();
|
|
OrderCallback callback = new OrderCallback();
|
|
|
callback.setMessageType(messageType);
|
|
callback.setMessageType(messageType);
|
|
|
callback.setMessage(req);
|
|
callback.setMessage(req);
|
|
|
|
|
+ callback.setCreateTime(TimeUtils.getLongFromCurrentTime());
|
|
|
//当 message_type == 商品类的事件 时跳过保存,其他类型才入库
|
|
//当 message_type == 商品类的事件 时跳过保存,其他类型才入库
|
|
|
if (CallbackMessageType.GOODS_ALTER.equalsIgnoreCase(messageType) || CallbackMessageType.GOODS_UNDERCARRIAGE.equalsIgnoreCase(messageType)
|
|
if (CallbackMessageType.GOODS_ALTER.equalsIgnoreCase(messageType) || CallbackMessageType.GOODS_UNDERCARRIAGE.equalsIgnoreCase(messageType)
|
|
|
|| CallbackMessageType.GOODS_ON_SALE.equalsIgnoreCase(messageType) || CallbackMessageType.GOODS_DELETE.equalsIgnoreCase(messageType)) {
|
|
|| CallbackMessageType.GOODS_ON_SALE.equalsIgnoreCase(messageType) || CallbackMessageType.GOODS_DELETE.equalsIgnoreCase(messageType)) {
|
|
@@ -130,7 +139,13 @@ public class YxSupplyChannelManualController {
|
|
|
|
|
|
|
|
//售后通过
|
|
//售后通过
|
|
|
if (CallbackMessageType.AFTER_SALES_PASS.equalsIgnoreCase(messageType)) {
|
|
if (CallbackMessageType.AFTER_SALES_PASS.equalsIgnoreCase(messageType)) {
|
|
|
-
|
|
|
|
|
|
|
+ //第三方订单编号
|
|
|
|
|
+ String thirdOrderSn = reqJson.getString("third_order_sn");
|
|
|
|
|
+ //售后id
|
|
|
|
|
+ Integer afterSalesId = reqJson.getInteger("after_sales_id");
|
|
|
|
|
+ if (StringUtils.isNotBlank(thirdOrderSn) && afterSalesId != null) {
|
|
|
|
|
+ ordersService.updateRefundStatusByAfterSales(thirdOrderSn, afterSalesId, 2);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
callbackDao.save(callback);
|
|
callbackDao.save(callback);
|
|
@@ -159,7 +174,4 @@ public class YxSupplyChannelManualController {
|
|
|
return paySupplyService.executeAfterSalesExpress(req.getOrderSn());
|
|
return paySupplyService.executeAfterSalesExpress(req.getOrderSn());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|