临时锁定

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -243,7 +243,7 @@ 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")){
+                    if(g.getGoodsInputData().getType()!=null&&g.getGoodsInputData().getType().equals("class")){
                         arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
                     }
                 }
@@ -322,7 +322,7 @@ 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")){
+                    if(g.getGoodsInputData().getType()!=null&&g.getGoodsInputData().getType().equals("class")){
                         arrangeGrade(goods.getGoodsName(),goods.getGoodsId(),orderGoods.getOrderGoodsId(),gradeId,add.getUserId(),out_trade_no);
                     }
                 }