|
@@ -100,9 +100,7 @@ public class KwoTradeOrderService {
|
|
|
* @desc: 添加其他订单信息
|
|
* @desc: 添加其他订单信息
|
|
|
* @author: yzc
|
|
* @author: yzc
|
|
|
* @date: 2023-07-13 8:53
|
|
* @date: 2023-07-13 8:53
|
|
|
- * @Param id:
|
|
|
|
|
- * @Param tOrderNo:
|
|
|
|
|
- * @Param status:
|
|
|
|
|
|
|
+ * @Param tradeOrder:
|
|
|
* @Param param:
|
|
* @Param param:
|
|
|
* @Param isUpdate:
|
|
* @Param isUpdate:
|
|
|
* @return: void
|
|
* @return: void
|
|
@@ -118,7 +116,7 @@ public class KwoTradeOrderService {
|
|
|
kwoTradeOrderGoodsService.delByOrderId(id);
|
|
kwoTradeOrderGoodsService.delByOrderId(id);
|
|
|
GoodsInfo goodsInfo = param.getGoodsInfo();
|
|
GoodsInfo goodsInfo = param.getGoodsInfo();
|
|
|
KwoTradeOrderGoods goods = BeanUtils.copyProperties(goodsInfo, KwoTradeOrderGoods.class);
|
|
KwoTradeOrderGoods goods = BeanUtils.copyProperties(goodsInfo, KwoTradeOrderGoods.class);
|
|
|
- if (Objects.nonNull(goods)) {
|
|
|
|
|
|
|
+ if (Objects.nonNull(goods) && Objects.nonNull(goods.getGoodsId())) {
|
|
|
GoodsDetail goodsDetail = goodsInfoService.getDetailById(goods.getGoodsId());
|
|
GoodsDetail goodsDetail = goodsInfoService.getDetailById(goods.getGoodsId());
|
|
|
if (Objects.isNull(goodsDetail) || !Objects.equals(goodsDetail.getStatus(), 1)
|
|
if (Objects.isNull(goodsDetail) || !Objects.equals(goodsDetail.getStatus(), 1)
|
|
|
|| Objects.equals(goodsDetail.getDelFlag(), Global.YES)) {
|
|
|| Objects.equals(goodsDetail.getDelFlag(), Global.YES)) {
|