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

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserPaymentClient.java

@@ -137,13 +137,6 @@ public class UserPaymentClient {
         }
         log.info("refund vendor={}, refundResp={}", vendor, JSON.toJSONString(refundResp));
 
-        // 退款订单确认
-        UserOrderRefundBill refundBill = userOrderRefundBillService.getByTransNoOrOrderNo(null, refundResp.getMerOrderNo());
-        if (Objects.isNull(refundBill)) {
-            log.warn("refund REFUND_FAILED, vendor={}, refundResp={}", vendor, JSON.toJSONString(refundResp));
-            return refundResp.getMsg();
-        }
-
         // 执行退款回调流程
         userPaymentCoreService.refundPaymentCallback(refundResp);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PaymentDivMember.java

@@ -23,7 +23,8 @@ import java.util.Date;
 public class PaymentDivMember implements Serializable {
 
     @ApiModelProperty("主键") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PaymentDivMemberRecord.java

@@ -26,7 +26,8 @@ import java.math.BigDecimal;
 public class PaymentDivMemberRecord implements Serializable {
 
     @ApiModelProperty("主键") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/PaymentMerchantConfig.java

@@ -24,7 +24,8 @@ import java.util.Date;
 public class PaymentMerchantConfig implements Serializable {
 
     @ApiModelProperty("主键") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysGoodsPrice.java

@@ -24,7 +24,8 @@ import java.math.BigDecimal;
 public class SysGoodsPrice implements Serializable {
 
     @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("商品类型") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAccountRecord.java

@@ -26,7 +26,7 @@ import java.math.BigDecimal;
 public class TenantAccountRecord implements Serializable {
 
     @ApiModelProperty("id") 
-	    @TableId(value = "id_")
+	    @TableId(value = "id_",type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构id") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantActivationCode.java

@@ -24,7 +24,8 @@ import java.util.Date;
 public class TenantActivationCode implements Serializable {
 
     @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAlbum.java

@@ -24,7 +24,8 @@ import java.math.BigDecimal;
 public class TenantAlbum implements Serializable {
 
     @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("专辑名称") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAlbumMusic.java

@@ -24,7 +24,8 @@ import java.util.Date;
 public class TenantAlbumMusic implements Serializable {
 
     @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAlbumPurchase.java

@@ -24,7 +24,8 @@ import java.math.BigDecimal;
 public class TenantAlbumPurchase implements Serializable {
 
     @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAlbumRef.java

@@ -23,7 +23,8 @@ import java.util.Date;
 public class TenantAlbumRef implements Serializable {
 
     @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantApplyRecord.java

@@ -24,7 +24,8 @@ import java.util.Date;
 public class TenantApplyRecord implements Serializable {
 
     @ApiModelProperty("主键ID") 
-    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantEntryRecord.java

@@ -23,7 +23,8 @@ import java.util.Date;
 public class TenantEntryRecord implements Serializable {
 
     @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构入驻申请记录") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantInfo.java

@@ -24,7 +24,8 @@ import java.util.Date;
 public class TenantInfo  implements Serializable  {
 
     @ApiModelProperty("主键ID")
-    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("名称")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantMember.java

@@ -34,7 +34,8 @@ import java.math.BigDecimal;
 @TableName("tenant_member")
 public class TenantMember implements Serializable {
 
-    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("支付类型 ADAPAY,YEEPAY")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantPersonStat.java

@@ -22,7 +22,8 @@ import java.util.Date;
 @TableName("tenant_person_stat")
 public class TenantPersonStat implements Serializable {
 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构编号") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantStaff.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,8 @@ import java.util.Date;
 public class TenantStaff implements Serializable {
 
     @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
 	    private Long id;
 
     @ApiModelProperty("机构ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantUnbindHistory.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,8 @@ import java.util.Date;
 public class TenantUnbindHistory implements Serializable {
 
     @ApiModelProperty("主键ID")
-    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("机构ID")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantUnbindRecord.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,8 @@ import java.util.Date;
 public class TenantUnbindRecord implements Serializable {
 
     @ApiModelProperty("主键ID")
-    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("机构ID")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UnbindAuthUser.java

@@ -23,7 +23,8 @@ import java.util.Date;
 public class UnbindAuthUser implements Serializable {
 
     @ApiModelProperty("主键") 
-    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("员工ID") 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserTenantAlbumRecord.java

@@ -25,7 +25,8 @@ import java.util.Date;
 public class UserTenantAlbumRecord implements Serializable {
 
     @ApiModelProperty("记录id") 
-    @TableId(value = "id_")
+
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty("用户id") 

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

@@ -657,7 +657,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
         reqConfig.setUserId(userInfo.getUserId());
 
         // 用户下单请求锁
-        String lockName = redisCacheService.getPaymentCacheKey(userInfo.getUserId());
+        String lockName = redisCacheService.getExecuteOrderCacheKey(userInfo.getUserId());
 
         // 分布式锁，用户支付请求
         return DistributedLock.of(redissonClient).runIfLockToFunction(lockName, this::executePayment, reqConfig, 10L);
@@ -1174,9 +1174,8 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             throw  new BizException("订单状态异常");
         }
 
-
         // 执行状态锁定
-        String lockName = redisCacheService.getExecuteOrderCacheKey(paymentOrder.getUserId().toString());
+        String lockName = redisCacheService.getPaymentCacheKey(paymentOrder.getOrderNo());
         DistributedLock.of(redissonClient).runIfLockCanGet(lockName, () -> {
             // 提交退款申请记录
             UserOrderRefund userRefundOrder = new UserOrderRefund();
@@ -1205,19 +1204,25 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             refundOrder.setReason(reason);
             refundOrder.setTransNo(paymentOrder.getTransNo());
             refundOrder.setPaymentOrderNo(paymentOrder.getOrderNo());
-            RefundResp refundResp = paymentServiceContext.getPaymentService(paymentOrder.getPaymentVendor()).refund(refundOrder);
-            // 申请请求失败
-            if (PaymentStatus.FAILED == refundResp.getPaymentStatus()) {
-                orderRefundBill.setStatus(TradeStatusEnum.failed);
-                orderRefundBill.setPayFailMsg(refundResp.getMsg());
-            } else {
-                orderRefundBill.setTransNo(refundResp.getTransNo());
-                orderRefundBill.setStatus(TradeStatusEnum.pending);
-            }
-            userOrderRefundBillService.save(orderRefundBill);
 
-            //处理退款业务
-           userOrderRefundService.orderRefundSuccessBizHandle(userRefundOrder.getId());
+            // 执行状态锁定
+            String lockNameInner = redisCacheService.getPaymentCacheKey(orderRefundBill.getBillNo());
+            DistributedLock.of(redissonClient).runIfLockCanGet(lockNameInner, () -> {
+                RefundResp refundResp = paymentServiceContext.getPaymentService(paymentOrder.getPaymentVendor()).refund(refundOrder);
+                // 申请请求失败
+                if (PaymentStatus.FAILED == refundResp.getPaymentStatus()) {
+                    orderRefundBill.setStatus(TradeStatusEnum.failed);
+                    orderRefundBill.setPayFailMsg(refundResp.getMsg());
+                } else {
+                    orderRefundBill.setTransNo(refundResp.getTransNo());
+                    orderRefundBill.setStatus(TradeStatusEnum.pending);
+                }
+                userOrderRefundBillService.save(orderRefundBill);
+
+                //处理退款业务
+               userOrderRefundService.orderRefundSuccessBizHandle(userRefundOrder.getId());
+
+            }, 10L, TimeUnit.SECONDS);
 
         }, 10L, TimeUnit.SECONDS);
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SysMusicCompareRecordController.java

@@ -76,11 +76,6 @@ public class SysMusicCompareRecordController extends BaseController {
             return failed("时间不能为空");
         }
         queryInfo.setClientId("student");
-        LocalDate localDate = LocalDate.parse(queryInfo.getStartTime() + "-01",
-                                              DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        queryInfo.setStartTime(localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        LocalDate endDate = localDate.plusDays(localDate.getMonth().length(localDate.isLeapYear()) -1);
-        queryInfo.setEndTime(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         return succeed(sysMusicCompareRecordService.studentTrainData(queryInfo));
     }
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UserOrderRefundController.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderRefundReq;
 import com.yonge.cooleshow.biz.dal.dto.search.UserOrderRefundSearch;
+import com.yonge.cooleshow.biz.dal.service.RedisCacheService;
 import com.yonge.cooleshow.biz.dal.service.UserPaymentCoreService;
 import com.yonge.cooleshow.common.enums.CacheNameEnum;
 import com.yonge.cooleshow.biz.dal.service.UserOrderRefundService;
@@ -38,6 +39,8 @@ public class UserOrderRefundController extends BaseController {
     @Autowired
     private UserPaymentCoreService userPaymentCoreService;
 
+    @Autowired
+    private RedisCacheService redisCacheService;
     /**
      * 查询单条
      */
@@ -104,10 +107,9 @@ public class UserOrderRefundController extends BaseController {
 
         try {
             DistributedLock.of(redissonClient)
-                    .runIfLockCanGet(CacheNameEnum.LOCK_EXECUTE_ORDER.getRedisKey(refundReq.getUserId())
-                            , () -> {
-                        userPaymentCoreService.refundPayment(refundReq.getOrderNo(),refundReq.getReason());
-                            }, 10L,TimeUnit.SECONDS);
+                    .runIfLockCanGet(redisCacheService.getPaymentCacheKey(refundReq.getOrderNo())
+                            , () -> userPaymentCoreService.refundPayment(refundReq.getOrderNo(),refundReq.getReason()),
+                            10L,TimeUnit.SECONDS);
             return HttpResponseResult.succeed();
         } catch (BizException e) {
             return HttpResponseResult.failed(e.getMessage());

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysMusicCompareRecordController.java

@@ -73,11 +73,6 @@ public class SysMusicCompareRecordController extends BaseController {
         if (StringUtils.isEmpty(queryInfo.getStartTime())) {
             return failed("时间不能为空");
         }
-        LocalDate localDate = LocalDate.parse(queryInfo.getStartTime() + "-01",
-                                              DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        queryInfo.setStartTime(localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        LocalDate endDate = localDate.plusDays(localDate.getMonth().length(localDate.isLeapYear()) -1);
-        queryInfo.setEndTime(endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         return succeed(sysMusicCompareRecordService.studentTrainData(queryInfo));
     }