增加 参数校验

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinBackOrderDetailsVo.java

@@ -67,6 +67,8 @@ public class GoblinBackOrderDetailsVo implements Serializable, Cloneable {
     private String createdAt;
     @ApiModelProperty(value = "过期时间")
     private String expireAt;
+    @ApiModelProperty(value = "拒绝时间")
+    private String RefuseAt;
 
     @ApiModelProperty(value = "支付时间")
     private String payTime;

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

@@ -195,7 +195,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 return ResponseDto.failure(e.getMessage());
             } else if (e.getMessage().equals("平台券店铺券不可一起使用")) {
                 return ResponseDto.failure(e.getMessage());
-            }else if (e.getMessage().equals("平台券店铺券不可一起使用")) {
+            } else if (e.getMessage().equals("平台券店铺券不可一起使用")) {
                 return ResponseDto.failure(e.getMessage());
             } else if (e.getMessage().equals("跨店铺购物平台券不可用")) {
                 return ResponseDto.failure(e.getMessage());
@@ -293,7 +293,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             throw new Exception("平台券店铺券不可一起使用");
         }
 
-        if(param.getGoblinOrderStoreParamList().size()>1 && (platVoucherCode != null && !platVoucherCode.equals(""))){
+        if (param.getGoblinOrderStoreParamList().size() > 1 && (platVoucherCode != null && !platVoucherCode.equals(""))) {
             throw new Exception("跨店铺购物平台券不可用");
         }
 
@@ -940,6 +940,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             });
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                     SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku, sqlsBackOrder));
+            //减积分
+            orderUtils.desTask(orderVo.getUserId(), backOrderVo.getRealBackPrice());
         } else if (0 == status) {
 
         }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinZhengzaiServiceImpl.java

@@ -144,7 +144,15 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
                 return ResponseDto.failure("该商品已经配置");
             }
         }
+        GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(params.getSpuId());
+        List<String> skuSize = params.getGoblinStoreZhengzaiItemParams().stream().distinct().map(GoblinStoreZhengzaiItemParam::getSkuId).collect(Collectors.toList());
+        if (spuVo.getSkuIdList().size() != skuSize.size()) {
+            return ResponseDto.failure("参数异常");
+        }
         for (GoblinStoreZhengzaiItemParam item : params.getGoblinStoreZhengzaiItemParams()) {
+            if (!spuVo.getSkuIdList().contains(item.getSkuId())) {
+                return ResponseDto.failure("参数异常");
+            }
             String zhengzaiId = IDGenerator.nextMilliId2();
             GoblinMarketingZhengzai bean = GoblinMarketingZhengzai.getNew();
             bean.setStoreId(params.getStoreId());
@@ -182,6 +190,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             skuVo.setBuyRoster(bean.getBuyRoster());
             skuVo.setBuyFactor(bean.getBuyFactor().toString());
             skuVo.setMarketId(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().concat(params.getSelfMarketId()));
+            skuVo.setCreatedAt(LocalDateTime.now());
             mongoUtils.upsertGoodsSkuInfoVo(skuVo);
             //redis
             redisUtils.setGoodsSkuInfoVo(skuVo);
@@ -199,7 +208,6 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             return ResponseDto.failure("148001", JsonUtils.toJson(errorNameList));
         }
         //mongo
-        GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(params.getSpuId());
         spuVo.setSpuId(marketSpuId);
         spuVo.setSkuIdList(marketSkuList);
         //排序
@@ -236,7 +244,12 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         sqls.add(SqlMapping.get("goblin.self.market.updateRelation"));
         LinkedList<Object[]> sqlsData = CollectionUtil.linkedListObjectArr();
+
+        GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(params.getSpuId());
         for (GoblinStoreZhengzaiItemParam item : params.getGoblinStoreZhengzaiItemParams()) {
+            if (!spuVo.getSkuIdList().contains(item.getSkuId())) {
+                return ResponseDto.failure("参数异常");
+            }
             GoblinMarketingZhengzai bean = GoblinMarketingZhengzai.getNew();
             bean.setPriceMarketing(item.getPriceMarketing());
             bean.setStockMarketing(item.getStockMarketing());
@@ -286,7 +299,6 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             return ResponseDto.failure("148001", JsonUtils.toJson(errorNameList));
         }
         //mongo
-        GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(params.getSpuId());
         spuVo.setSpuId(marketSpuId);
         //排序
         priceList = priceList.stream().sorted().collect(Collectors.toList());

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinOrderUtils.java

@@ -201,4 +201,19 @@ public class GoblinOrderUtils {
             e.printStackTrace();
         }
     }
+
+    public void desTask(String uid, BigDecimal price) {
+        try {
+            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+            header.add("Accept", "application/json;charset=UTF-8");
+            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+            params.add("score", price.intValue() + "");
+            params.add("content", "购买商品:");
+            params.add("uid", uid);
+            String resultData = HttpUtil.post(stoneUrl + "/user/logs/de2111", params, header);
+        } catch (Exception e) {
+            log.error("添加积分失败,e:{}", e);
+            e.printStackTrace();
+        }
+    }
 }