|
@@ -186,7 +186,7 @@ public class DfyHotelServiceImpl implements DfyHotelService {
|
|
|
ownerList.add(use);
|
|
|
goods.setTransferRrule(ownerList);
|
|
|
JSONObject entries = JSONUtil.parseObj(addOrderResponse.getData());
|
|
|
- entries.put("orderInfo",orderDetailResponse.getData().getOrderInfo());
|
|
|
+ entries.put("orderInfo", orderDetailResponse.getData().getOrderInfo());
|
|
|
goods.setExtend(JSONUtil.toJsonStr(entries));
|
|
|
createOrder2Model.setGoodsList(List.of(goods));
|
|
|
return orderService2.creat(createOrder2Model);
|
|
@@ -274,7 +274,7 @@ public class DfyHotelServiceImpl implements DfyHotelService {
|
|
|
updateGoodsModel.setExtend(JSONUtil.toJsonStr(entries));
|
|
|
orderService2.updateGoods(updateGoodsModel);
|
|
|
|
|
|
- return ResultContent.buildContent(cancelOrderResponse);
|
|
|
+ return cancelOrderResponse.getSuccess()?ResultContent.buildContent(cancelOrderResponse):ResultContent.build(ResultState.Fail, cancelOrderResponse.getMsg());
|
|
|
|
|
|
}
|
|
|
}
|