Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/model/response/integral/IntegralShareResponse.java

@@ -103,7 +103,7 @@ public class IntegralShareResponse {
      */
     @Excel(name = "系统当前时间")
     @ApiModelProperty(value = "系统当前时间")
-    private String nowTime;
+    private String nowDate;
 
     /*
      * 相关属性

src/main/java/com/dk/oauth/service/integral/CouponSendService.java

@@ -91,13 +91,13 @@ public class CouponSendService extends BaseService<CouponSend> {
             return ResponseResultUtil.success(map);
         } else {
             //region 新建
-            this.insertCouponSend(couponSendVO);
+            CouponSend couponSend = this.insertCouponSend(couponSendVO);
             //endregion
             // 返回请求数据时系统的当前时间
             LocalDateTime now = LocalDateTime.now();
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            couponSendVO.setNowTime(now.format(formatter));
-            return ResponseResultUtil.success(couponSendVO);
+            couponSend.setNowTime(now.format(formatter));
+            return ResponseResultUtil.success(couponSend);
         }
 
 //        20240801
@@ -169,7 +169,7 @@ public class CouponSendService extends BaseService<CouponSend> {
      * @author : 寇珊珊
      */
     @Transactional(rollbackFor = {Exception.class})
-    public void insertCouponSend(CouponSendVO couponSendVO) {
+    public CouponSend insertCouponSend(CouponSendVO couponSendVO) {
         //查询优惠券
         List<CouponResponse> couponResponses = couponMapper.selectByCond(new CouponQuery());
         //发出时间
@@ -179,6 +179,7 @@ public class CouponSendService extends BaseService<CouponSend> {
         couponSendVO.setEndDate(couponSendVO.getSendDate().plusHours(linkValidTimes));
         CouponSend couponSend = couponSendConvert.convertToPo(couponSendVO);
         couponSendMapper.insert(couponSend);
+        return couponSend;
     }
 
     /**

src/main/java/com/dk/oauth/service/integral/IntegralShareService.java

@@ -104,6 +104,7 @@ public class IntegralShareService extends BaseService<IntegralShare> {
         if (Constant.IntegralType.INTEGRAL_TYPE_INVITE.getName().equals(integralShareVO.getIntegralType())) {
             IntegralShareQuery integralShareQuery = new IntegralShareQuery()
                     .setCpId(integralShareVO.getCpId())
+                    .setUserId(integralShareVO.getUserId())
                     .setShareDateFlag(true)
                     .setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_INVITE.getName());
             //region 查询积分分享 当日已经分享的次数
@@ -115,7 +116,7 @@ public class IntegralShareService extends BaseService<IntegralShare> {
                 IntegralShareResponse response = integralShareResponses.get(0);
                 LocalDateTime now = LocalDateTime.now();
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                response.setNowTime(now.format(formatter));
+                response.setNowDate(now.format(formatter));
                 return ResponseResultUtil.success(response);
             }
             //endregion
@@ -127,6 +128,7 @@ public class IntegralShareService extends BaseService<IntegralShare> {
             //region 查询积分分享 当日已经分享的次数
             Long shareSize = integralShareMapper.countByCond(new IntegralShareQuery()
                     .setCpId(integralShareVO.getCpId())
+                    .setUserId(integralShareVO.getUserId())
                     .setShareDateFlag(true)
                     .setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_SHARE.getName())
             );