erp 组合购提交

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/erp/WdtController.java

@@ -29,7 +29,7 @@ public class WdtController {
     })
     public ResponseDto<Boolean> initErpStock(@RequestParam(value = "spuId", required = false) String spuId,
                                              @RequestParam(value = "min", required = false) Integer min) {
-        if (min <= 0) {
+        if ( min == null || min <= 0) {
             min = 5;
         }
         return goblinErpService.initErpStock(spuId, min);
@@ -42,7 +42,7 @@ public class WdtController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderId", value = "orderId"),
     })
-    public ResponseDto<Boolean> pushTrade(@RequestParam(value = "orderId",required = false) String orderId) {
+    public ResponseDto<Boolean> pushTrade(@RequestParam(value = "orderId", required = false) String orderId) {
         return goblinErpService.pushTrade(orderId);
     }
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/erp/WdtServiceImpl.java

@@ -79,6 +79,9 @@ public class WdtServiceImpl implements IGoblinErpService {
             if (null != spuId && !"".equals(spuId)) {
                 //查询 spu下的sku
                 GoblinGoodsInfoVo goblinGoodsInfoVo = goblinRedisUtils.getGoodsInfoVo(spuId);
+                if(goblinGoodsInfoVo==null){
+                    return ResponseDto.failure("参数错误");
+                }
                 for (String skuId : goblinGoodsInfoVo.getSkuIdList()) {
                     GoblinGoodsSkuInfoVo skuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(skuId);
                     if (skuInfoVo.getErpHosting() == 1) {