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

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinStoreConfigService;
 import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinStoreInfoService;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreConfigVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
 import com.liquidnet.service.goblin.entity.GoblinStoreInfo;
@@ -37,6 +39,8 @@ public class GoblinStoreInfoServiceImpl extends ServiceImpl<GoblinStoreInfoMappe
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
+    private RedisDataSourceUtil redisDataSourceUtil;
+    @Autowired
     private IGoblinStoreConfigService goblinStoreConfigService;
 
     @Override
@@ -69,7 +73,8 @@ public class GoblinStoreInfoServiceImpl extends ServiceImpl<GoblinStoreInfoMappe
                 log.error("店铺管理:店铺审核:MDB更新失败[storeId={},status={},operator={}]", storeId, status, operator);
                 throw new LiquidnetServiceException();
             }
-            // TODO: 2021/12/29 zhanggb redis
+
+            redisDataSourceUtil.getRedisGoblinUtil().del(GoblinRedisConst.BASIC_STORE.concat(storeId));
 
             return true;
         }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -78,7 +78,7 @@ public class PayController {
 //               @RequestParam(value = "code",required = false)  String code,
             @RequestParam(value = "createDate", required = true) String createDate,
             @RequestParam(value = "expireTime", required = true) String expireTime,
-            @RequestParam(value = "authCode", required = true) String authCode) {
+            @RequestParam(value = "authCode", required = false) String authCode) {
         long startTime = System.currentTimeMillis();
         //为什么在js和applet中才需要判断open_id?
         if (payType.equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())) {