|
@@ -243,10 +243,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
Long gradeId = null;
|
|
|
if(g.getGoodsInputData()!=null){
|
|
|
gradeId = g.getGoodsInputData().getGradeId();
|
|
|
+ if(g.getGoodsInputData().getType().equals("class")){
|
|
|
+ arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
|
|
|
+ }
|
|
|
}
|
|
|
- if(g.getGoodsInputData().getType().equals("class")){
|
|
|
- arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -321,10 +322,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
Long gradeId = null;
|
|
|
if(g.getGoodsInputData()!=null){
|
|
|
gradeId = g.getGoodsInputData().getGradeId();
|
|
|
+ if(g.getGoodsInputData().getType().equals("class")){
|
|
|
+ arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
|
|
|
+ }
|
|
|
}
|
|
|
- if(g.getGoodsInputData().getType().equals("class")){
|
|
|
- arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
iShoppingCartService.deleteByGoodsId(g.getGoodsId(),bo.getUserId());
|
|
|
}
|