Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinInsertZhengzaiParam.java

@@ -15,6 +15,8 @@ public class GoblinInsertZhengzaiParam {
     private String storeId;
     @ApiModelProperty(required = true, value = "显示时间")
     private String showTime;
+    @ApiModelProperty(required = true, value = "是否新增[0-否|1-是]")
+    private Integer newTag;
     @ApiModelProperty(required = true, value = "是否删除[0-否|1-是]")
     private Integer delTag;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfZhengzaiController.java

@@ -113,12 +113,12 @@ public class GoblinSelfZhengzaiController extends BaseController {
         return goblinZhengzaiMarketService.zhengzaiStore(params);
     }
 
-    @PostMapping("zhengzai/store/update")
-    @ApiOperation("活动详情-正在下单-修改店铺")
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<Boolean> purchasingStoreUpdate(@RequestBody List<GoblinInsertZhengzaiParam> params) {
-        return goblinZhengzaiMarketService.zhengzaiStore(params);
-    }
+//    @PostMapping("zhengzai/store/update")
+//    @ApiOperation("活动详情-正在下单-修改店铺")
+//    @ApiResponse(code = 200, message = "接口返回对象参数")
+//    public ResponseDto<Boolean> purchasingStoreUpdate(@RequestBody List<GoblinInsertZhengzaiParam> params) {
+//        return goblinZhengzaiMarketService.zhengzaiStore(params);
+//    }
 
 
     @PostMapping("zhengzai/store/list")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java

@@ -191,6 +191,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
     @Override
     public ResponseDto<Boolean> zhengzaiStore(List<GoblinInsertZhengzaiParam> params) {
         for (GoblinInsertZhengzaiParam item : params) {
+            if(item.getNewTag()==1){//新增
                 String marketId = item.getMarketId();
                 String storeId = item.getStoreId();
                 String showTime = item.getShowTime();
@@ -212,6 +213,39 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
                 //redis
                 goblinRedisUtils.setZhengzaiRelation(marketId, vo);
                 goblinRedisUtils.addStoreSelfRelation(marketId, storeId);
+            }else{//修改
+                int delTag = item.getDelTag();
+                String showTime = item.getShowTime();
+                String marketId = item.getMarketId();
+                String storeId = item.getStoreId();
+                if (delTag == 0) {
+                    GoblinMarketingZhengzaiRelation entity = GoblinMarketingZhengzaiRelation.getNew();
+                    entity.setShowTime(LocalDateTime.parse(showTime, DTF_YMD_HMS));
+                    entity.setUpdatedAt(LocalDateTime.now());
+                    //mysql
+                    goblinMarketingZhengzaiRelationMapper.update(entity, Wrappers.lambdaUpdate(GoblinMarketingZhengzaiRelation.getNew()).eq(GoblinMarketingZhengzaiRelation::getSelfMarketId, marketId).eq(GoblinMarketingZhengzaiRelation::getStoreId, storeId));
+                    //mongo
+                    GoblinMarketingZhengzaiRelationVo vo = GoblinMarketingZhengzaiRelationVo.getNew();
+                    BeanUtils.copyProperties(entity, vo);
+                    vo.setShowTime(showTime);
+                    goblinMongoUtils.updateZhengzaiRelation(marketId, storeId, vo);
+                    //redis
+                    goblinRedisUtils.setZhengzaiRelation(marketId, vo);
+                    goblinRedisUtils.addStoreSelfRelation(marketId, storeId);
+                } else if (delTag == 1) {
+                    GoblinMarketingZhengzaiRelation entity = GoblinMarketingZhengzaiRelation.getNew();
+                    entity.setDelTag(1);
+                    entity.setUpdatedAt(LocalDateTime.now());
+                    //mysql
+                    goblinMarketingZhengzaiRelationMapper.update(entity, Wrappers.lambdaUpdate(GoblinMarketingZhengzaiRelation.getNew()).eq(GoblinMarketingZhengzaiRelation::getSelfMarketId, marketId).eq(GoblinMarketingZhengzaiRelation::getStoreId, storeId));
+                    //mongo
+                    goblinMongoUtils.delZhengzaiRelation(marketId, storeId);
+                    //redis
+                    goblinRedisUtils.delZhengzaiRelation(marketId, storeId);
+                    goblinRedisUtils.delStoreSelfRelation(marketId, storeId);
+                }
+            }
+
         }
         return ResponseDto.success();
     }