Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -613,7 +613,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             .subject(subject)
             .body(subject)
             .price(orderReq.getPaymentCashAmount().setScale(2, RoundingMode.HALF_UP))
-            .expirationTime(DateTime.now().plusMinutes(30).toDate())
+            .expirationTime(DateTime.now().plusMinutes(120).toDate())
             .wxAppId(paymentServiceContext.getPaymentService(orderReq.getPaymentVendor()).getPaymentConfig().getWxAppId())
             .userId(String.valueOf(orderReq.getUserId()))
             .build();
@@ -857,7 +857,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
         DistributedLock.of(redissonClient).runIfLockCanGet(lockName, () -> {
 
             // 下单未拉起三方支付，直接关闭
-            if (StringUtils.isEmpty(paymentOrder.getTransNo())) {
+            if (StringUtils.isEmpty(paymentOrder.getTransNo()) && EPaymentStatus.WAIT_PAY == paymentOrder.getStatus()) {
 
                 // 直接关闭订单
                 UserPaymentOrderWrapper.UserPaymentOrder order = UserPaymentOrderWrapper.UserPaymentOrder

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantApplyRecordWrapper.java

@@ -70,6 +70,9 @@ public class TenantApplyRecordWrapper {
     @AllArgsConstructor
 	@ApiModel(" TenantApplyRecord-机构入驻申请记录")
     public static class TenantApplyRecord {
+        @ApiModelProperty("id")
+        private Long id;
+
         @ApiModelProperty("名称")
         private String name;
 
@@ -107,6 +110,10 @@ public class TenantApplyRecordWrapper {
         @ApiModelProperty("审核理由")
         private String reason;
 
+
+        @ApiModelProperty("简介")
+        private String briefIntroduction;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/PaymentDivMemberRecordController.java

@@ -27,7 +27,7 @@ public class PaymentDivMemberRecordController {
     private PaymentDivMemberRecordService paymentDivMemberRecordService;
 
 	@ApiOperation(value = "详情", notes = "分账子账户记录表-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/detail', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/detail', {'BACKEND'})")
     //@GetMapping("/detail/{id}")
     public R<PaymentDivMemberRecord> detail(@PathVariable("id") Long id) {
     
@@ -37,7 +37,7 @@ public class PaymentDivMemberRecordController {
 	}
     
     @ApiOperation(value = "查询分页", notes = "分账子账户记录表- 传入 PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery") 
-    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/page', {'BACKEND'})") 
+//    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/page', {'BACKEND'})")
     @PostMapping("/page")
     public R<PageInfo<PaymentDivMemberRecord>> page(@RequestBody PaymentDivMemberRecordWrapper.PaymentDivMemberRecordQuery query) {
         
@@ -47,7 +47,7 @@ public class PaymentDivMemberRecordController {
 	}
     
     @ApiOperation(value = "新增", notes = "分账子账户记录表- 传入 PaymentDivMemberRecordWrapper.PaymentDivMemberRecord")
-    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/save', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/save', {'BACKEND'})")
 	//@PostMapping("/save")
 	public R<JSONObject> add(@Validated @RequestBody PaymentDivMemberRecord paymentDivMemberRecord) {
         
@@ -58,7 +58,7 @@ public class PaymentDivMemberRecordController {
 	}
     
     @ApiOperation(value = "修改", notes = "分账子账户记录表- 传入 PaymentDivMemberRecordWrapper.PaymentDivMemberRecord")
-    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/update', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/update', {'BACKEND'})")
 	public R<JSONObject> update(@Validated @RequestBody PaymentDivMemberRecord paymentDivMemberRecord) {
         
         // 更新数据
@@ -68,7 +68,7 @@ public class PaymentDivMemberRecordController {
 	}
 
 	@ApiOperation(value = "删除", notes = "分账子账户记录表- 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/remove', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('paymentDivMemberRecord/remove', {'BACKEND'})")
 	public R<Boolean> remove(@RequestParam Long id) {
     
 		return R.from(paymentDivMemberRecordService.removeById(id));

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/SysAreaController.java

@@ -75,7 +75,7 @@ public class SysAreaController {
 	 * @return R<PageInfo<SysAreaVo.SysAreaList>>
 	 */
     @ApiOperation(value = "查询分页", notes = "传入sysAreaSearch")
-    @PreAuthorize("@auditsvc.hasPermissions('sysArea/page', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('sysArea/page', {'BACKEND'})")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<SysAreaWrapper.SysArea>> page(@RequestBody SysAreaWrapper.SysAreaQuery query) {
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumController.java

@@ -99,7 +99,7 @@ public class TenantAlbumController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbum/remove', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbum/remove', {'BACKEND'})")
 //    @PostMapping("/remove")
     public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
         return HttpResponseResult.succeed(tenantAlbumService.removeById(id));

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumPurchaseController.java

@@ -54,7 +54,7 @@ public class TenantAlbumPurchaseController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/detail', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/detail', {'BACKEND'})")
 //    @GetMapping("/detail/{id}")
     public HttpResponseResult<TenantAlbumPurchaseWrapper.TenantAlbumPurchase> detail(@PathVariable("id") Long id) {
 
@@ -64,7 +64,7 @@ public class TenantAlbumPurchaseController extends BaseController {
     }
 
     @ApiOperation(value = "查询分页", notes = "机构专辑采购- 传入 TenantAlbumPurchaseVo.TenantAlbumPurchaseQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/page', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/page', {'BACKEND'})")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<TenantAlbumPurchaseWrapper.TenantAlbumPurchase>> page(
             @RequestBody TenantAlbumPurchaseWrapper.TenantAlbumPurchaseQuery query) {
@@ -77,7 +77,7 @@ public class TenantAlbumPurchaseController extends BaseController {
     }
 
     @ApiOperation(value = "新增", notes = "机构专辑采购- 传入 TenantAlbumPurchaseVo.TenantAlbumPurchase")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/save', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/save', {'BACKEND'})")
 //    @PostMapping("/save")
     public HttpResponseResult<JSONObject> add(
             @Validated @RequestBody TenantAlbumPurchaseVo.TenantAlbumPurchase tenantAlbumPurchaseVo) {
@@ -89,7 +89,7 @@ public class TenantAlbumPurchaseController extends BaseController {
     }
 
     @ApiOperation(value = "修改", notes = "机构专辑采购- 传入 TenantAlbumPurchaseVo.TenantAlbumPurchase")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/update', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/update', {'BACKEND'})")
 //    @PostMapping("/update")
     public HttpResponseResult<JSONObject> update(@Validated @RequestBody TenantAlbumPurchaseVo.TenantAlbumPurchase tenantAlbumPurchaseVo
     ) {
@@ -100,7 +100,7 @@ public class TenantAlbumPurchaseController extends BaseController {
     }
 
     @ApiOperation(value = "删除", notes = "机构专辑采购- 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/remove', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('tenantAlbumPurchase/remove', {'BACKEND'})")
 //    @PostMapping("/remove")
     public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -80,7 +80,7 @@ public class TenantInfoController extends BaseController {
      */
     @PostMapping("/update")
     @ApiOperation(value = "修改机构信息", notes = "传入TenantInfo")
-    @PreAuthorize("@pcs.hasPermissions('tenantInfoUpdate/update')")
+//    @PreAuthorize("@pcs.hasPermissions('tenantInfoUpdate/update')")
     public HttpResponseResult<Boolean> updateTenantInfo(@Valid @RequestBody TenantInfoVo.TenantInfo info) {
 
         return succeed(tenantInfoService.update(JSON.parseObject(info.jsonString(), TenantInfo.class)));
@@ -92,7 +92,7 @@ public class TenantInfoController extends BaseController {
      */
     @PostMapping("/detail")
     @ApiOperation(value = "查询详细", notes = "查询详细")
-    @PreAuthorize("@pcs.hasPermissions('tenantInfoUpdate/detail')")
+//    @PreAuthorize("@pcs.hasPermissions('tenantInfoUpdate/detail')")
     public HttpResponseResult<TenantInfoWrapper.TenantInfo> detail(@RequestParam("id")Long id) {
         TenantInfoWrapper.TenantInfo info = tenantInfoService.detailTenantInfo(id);
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenSysAreaController.java

@@ -75,7 +75,7 @@ public class OpenSysAreaController {
      * @return R<PageInfo<SysAreaVo.SysAreaList>>
      */
     @ApiOperation(value = "查询分页", notes = "传入sysAreaSearch")
-    @PreAuthorize("@auditsvc.hasPermissions('sysArea/page', {'BACKEND'})")
+//    @PreAuthorize("@auditsvc.hasPermissions('sysArea/page', {'BACKEND'})")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<SysAreaWrapper.SysArea>> page(@RequestBody SysAreaWrapper.SysAreaQuery query) {
 

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenTenantController.java

@@ -65,19 +65,18 @@ public class OpenTenantController {
         if (!validCode) {
             throw new BizException("验证码错误");
         }
-        TenantApplyRecord one = tenantApplyRecordService.lambdaQuery()
-                .eq(TenantApplyRecord::getPhone, phone)
-                .orderByDesc(TenantApplyRecord::getCreateTime)
-                .last("limit 1").one();
-        if (one == null || AuthStatusEnum.UNPASS.equals(one.getStatus())) {
-            throw new BizException(5002, "请先申请机构入驻");
-        }
-        if (AuthStatusEnum.DOING.equals(one.getStatus())) {
-            throw new BizException(5003, "请等待审核完成");
-        }
         TenantStaff tenantStaff = tenantStaffService.getByPhone(phone);
         if (tenantStaff == null) {
-            throw new BizException("账号注册失败");
+            TenantApplyRecord one = tenantApplyRecordService.lambdaQuery()
+                    .eq(TenantApplyRecord::getPhone, phone)
+                    .orderByDesc(TenantApplyRecord::getCreateTime)
+                    .last("limit 1").one();
+            if (one == null || AuthStatusEnum.UNPASS.equals(one.getStatus())) {
+                throw new BizException(5002, "请先申请机构入驻");
+            }
+            if (AuthStatusEnum.DOING.equals(one.getStatus())) {
+                throw new BizException(5003, "请等待审核完成");
+            }
         }
         tenantStaff.setWxOpenid(openId);
         tenantStaffService.updateById(tenantStaff);