|
|
@@ -19,10 +19,7 @@ import com.xiaoju.open.oil.interfaces.request.*;
|
|
|
import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniCancelOrderStatusRequest;
|
|
|
import com.xiaoju.open.oil.interfaces.response.*;
|
|
|
import com.xiaoju.open.oil.security.secret.SecurityService;
|
|
|
-import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
|
|
|
-import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
|
|
|
-import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
|
|
|
-import com.zhongshu.payment.client.model.order.v2.UpdateGoodsModel;
|
|
|
+import com.zhongshu.payment.client.model.order.v2.*;
|
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
|
import com.zhongshu.payment.client.type.JobFlowMap;
|
|
|
import com.zhongshu.payment.client.type.OrderType;
|
|
|
@@ -154,8 +151,14 @@ public class XiaoJuService {
|
|
|
|
|
|
ResultContent<List<GoodsResultModel>> listResultContent = orderService2.goodsDetail(notificationOrderInfoRequest.getOutOrderId());
|
|
|
for (GoodsResultModel goodsResultModel : listResultContent.getContent()) {
|
|
|
+ JSONObject entries = JSONUtil.parseObj(goodsResultModel.getExtend());
|
|
|
+ entries.set("notifyOrderInfo",notificationOrderInfoRequest);
|
|
|
|
|
|
UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
|
|
|
+ updateGoodsModel.setExtend(JSONUtil.toJsonStr(entries));
|
|
|
+
|
|
|
+ UpdateOrder2Model updateOrder2Model = new UpdateOrder2Model();
|
|
|
+ updateOrder2Model.setOrderNo(goodsResultModel.getOrderNo());
|
|
|
updateGoodsModel.setId(goodsResultModel.getId());
|
|
|
Integer orderStatus = notificationOrderInfoRequest.getOrderStatus();
|
|
|
switch (orderStatus) {
|
|
|
@@ -164,20 +167,21 @@ public class XiaoJuService {
|
|
|
break;
|
|
|
case 2:
|
|
|
updateGoodsModel.setGoodsState(OrderType.USED);
|
|
|
+ updateOrder2Model.setOrderType(OrderType.HAVE_PAID);
|
|
|
break;
|
|
|
case 6:
|
|
|
updateGoodsModel.setGoodsState(OrderType.REFUNDED);
|
|
|
break;
|
|
|
case 8:
|
|
|
- updateGoodsModel.setGoodsState(OrderType.CLOSE);
|
|
|
- break;
|
|
|
case 9:
|
|
|
updateGoodsModel.setGoodsState(OrderType.CLOSE);
|
|
|
+ updateOrder2Model.setOrderType(OrderType.CLOSE);
|
|
|
break;
|
|
|
|
|
|
|
|
|
}
|
|
|
orderService2.updateGoods(updateGoodsModel);
|
|
|
+ orderService2.updateOrderType(updateOrder2Model);
|
|
|
|
|
|
|
|
|
}
|
