|
@@ -152,33 +152,32 @@ 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) {
|
|
|
case 1:
|
|
|
+ entries.set("waitPayment",notificationOrderInfoRequest);
|
|
|
updateGoodsModel.setGoodsState(OrderType.WAIT_PAYMENT);
|
|
|
break;
|
|
|
case 2:
|
|
|
+ entries.set("notifyOrderInfo",notificationOrderInfoRequest);
|
|
|
updateGoodsModel.setGoodsState(OrderType.USED);
|
|
|
updateOrder2Model.setOrderType(OrderType.HAVE_PAID);
|
|
|
break;
|
|
|
case 6:
|
|
|
+ entries.set("refund",notificationOrderInfoRequest);
|
|
|
updateGoodsModel.setGoodsState(OrderType.REFUNDED);
|
|
|
break;
|
|
|
- case 8:
|
|
|
case 9:
|
|
|
+ entries.set("close",notificationOrderInfoRequest);
|
|
|
updateGoodsModel.setGoodsState(OrderType.CLOSE);
|
|
|
updateOrder2Model.setOrderType(OrderType.CLOSE);
|
|
|
break;
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
orderService2.updateGoods(updateGoodsModel);
|
|
|
orderService2.updateOrderType(updateOrder2Model);
|