拍品分享链接创建不用传shopId

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributorShareRecordServiceImpl.java

@@ -73,7 +73,7 @@ public class DistributorShareRecordServiceImpl implements DistributorShareRecord
             distributorShareRecord.setItemId(dto.getItemId());
             distributorShareRecord.setPrice(PriceUtil.convertPriceFromStr(dto.getPrice()));
             distributorShareRecord.setDistributorId(dto.getDistributorId());
-            distributorShareRecord.setShopId(dto.getShopId());
+            distributorShareRecord.setShopId(dto.getDistributorId());
             distributorShareRecord.setCreateTime(new Date());
             distributorShareRecord.setEnabled(true);
             distributorShareRecord.setType(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode());
@@ -107,7 +107,7 @@ public class DistributorShareRecordServiceImpl implements DistributorShareRecord
             //商品的起拍价
             distributorShareRecord.setPrice(auctionConfig.getStartPrice());
             distributorShareRecord.setDistributorId(dto.getDistributorId());
-            distributorShareRecord.setShopId(dto.getShopId());
+            distributorShareRecord.setShopId(dto.getDistributorId());
             distributorShareRecord.setCreateTime(new Date());
             distributorShareRecord.setEnabled(true);
             distributorShareRecord.setType(DistributionEnum.DistributionTypeEnum.AUCTION.getCode());

ch-wx-api/src/main/java/com/wwdz/ch/wx/job/SpecialPerformanceNoticeJob.java

@@ -117,6 +117,12 @@ public class SpecialPerformanceNoticeJob {
                     logger.info(">>>>>>>>>>>>>>>>>>>>>>> dev环境, 不执行专场即将开始通知任务<<<<<<<<<<<<<<<<<<<<<");
                     return;
                 }
+                //正式环境测试, 不发送消息
+                if (true) {
+                    logger.info(">>>>>>>>>>>>>>>>>>>>>>> 正式环境测试, 不执行专场即将开始通知任务<<<<<<<<<<<<<<<<<<<<<");
+                    return;
+                }
+
                 logger.info("当前即将开始的专场id:{}, 名称为 {} ", specialPerformance.getId(), specialPerformance.getTitle());
                 //发送短信通知
                 String url = wxAppletApi.getUrlLink(SPECIAL_PERFORMANCE_URL,"specialId=" + specialPerformance.getId());

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/DistributorShareRecordController.java

@@ -37,7 +37,6 @@ public class DistributorShareRecordController {
         validator.set("itemId", "商品id").must().number()
                 .set("price", "商品销售价").must().string()
                 .set("distributorId", "分销商id").must().number()
-                .set("shopId", "分销商店铺id").must().number()
                 .end();
         if (!validator.isValid()) {
             return Result.failed(validator.getErrorInfo());
@@ -53,7 +52,6 @@ public class DistributorShareRecordController {
         Validator validator = new Validator(FormHandler.ofEntity(dto));
         validator.set("itemId", "商品id").must().number()
                 .set("distributorId", "分销商id").must().number()
-                .set("shopId", "分销商店铺id").must().number()
                 .end();
         if (!validator.isValid()) {
             return Result.failed(validator.getErrorInfo());