Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/entity/Trade.java

@@ -203,6 +203,13 @@ public class Trade extends PageInfo<Trade> implements Serializable {
     @ApiModelProperty(value = "积分")
     private Integer integral;
 
+    /**
+     * 操作员工
+     */
+    @Excel(name = "操作员工")
+    @ApiModelProperty(value = "操作员工")
+    private String staffName;
+
 
     /**
      * @desc : 交易描述

src/main/java/com/dk/oauth/entity/TradeResponse.java

@@ -172,15 +172,20 @@ public class TradeResponse   {
      * @desc : 优惠券使用ID
      */
     @ApiModelProperty(value = "优惠券使用ID")
-    @Excel(name = "优惠券使用ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String couponUseId;
 
     /**
      * 积分
      */
-    @Excel(name = "积分")
     @ApiModelProperty(value = "积分")
     private Integer integral;
 
+
+    /**
+     * 操作员工
+     */
+    @ApiModelProperty(value = "操作员工")
+    private String staffName;
+
 }

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -27,10 +27,13 @@ import com.dk.oauth.model.pojo.integral.Integral;
 import com.dk.oauth.model.pojo.integral.IntegralItem;
 import com.dk.oauth.model.pojo.integral.IntegralTactic;
 import com.dk.oauth.model.query.integral.IntegralQuery;
+import com.dk.oauth.model.query.integral.IntegralTacticQuery;
 import com.dk.oauth.model.response.integral.IntegralResponse;
+import com.dk.oauth.model.response.integral.IntegralTacticResponse;
 import com.dk.oauth.query.*;
 import com.dk.oauth.response.*;
 import com.dk.oauth.service.ICompanyService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +57,7 @@ import java.util.Map;
  * @since 2023-07-01 09:41:05
  */
 @Service("companyService")
+@Slf4j
 public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements ICompanyService {
     @Resource
     CompanyMapper companyMapper;
@@ -268,12 +272,14 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         UserLogin userLogin = userMapper.selectById(companyVO.getOwner());
 
         //  来源公司Id 分享的截止日期时间 是否超过 当前的日期时间 说明过期了，过期不加积分 240724
+        log.info("邀请分享的记录：原公司id：{},截止日期：{},当前时间：{},",companyVO.getCpIdFrom(),companyVO.getShareEndTime(),LocalDateTime.now());
         if (companyVO.getCpIdFrom() != null && companyVO.getShareEndTime() != null
                 && companyVO.getShareEndTime().compareTo(LocalDateTime.now()) > 0) {
             // 积分策略 share_reg_integral	 分享注册积分
-            List<IntegralTactic> integralTactics = integralTacticMapper.selectByCond(new IntegralTactic());
-            if (integralTactics != null && integralTactics.size() > 0) {
-                IntegralTactic integralTactic = integralTactics.get(0);
+            List<IntegralTacticResponse> integralTacticResponses = integralTacticMapper.selectByCond(new IntegralTacticQuery());
+            log.info("积分策略：{},",integralTacticResponses);
+            if (integralTacticResponses != null && integralTacticResponses.size() > 0) {
+                IntegralTacticResponse integralTactic = integralTacticResponses.get(0);
                 // 积分明细 新公司的
                 IntegralItem integralItem = new IntegralItem();
                 integralItem.setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_REGISTER.getName());
@@ -300,7 +306,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                     integral.setIntegral(integralTactic.getRegIntegral());
                     integralMapper.insert(integral);
                 }
-
+                log.info("积分 新公司的：{},",integral);
                 // 积分明细 来源公司公司的
                 integralItem = new IntegralItem();
 //                邀请的注册
@@ -327,6 +333,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                     integral.setIntegral(integralTactic.getShareRegIntegral());
                     integralMapper.insert(integral);
                 }
+                log.info("积分 来源公司公司的：{},",integral);
             }
         }
 
@@ -354,6 +361,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             trade.setExtendDays(companyVO.getExtendDays());
             trade.setBuyGradeCode(companyVO.getGradeCode());
             trade.setTradeStatus(Constant.TradeStatus.INEFFECTIVE.getName());
+            trade.setStaffName(userLogin.getUserPhone());
             tradeMapper.insert(trade);
         }
 
@@ -599,6 +607,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         trade.setActivityItemId(companyVO.getActivityItemId());
         trade.setActivityIds(companyVO.getActivityIds());
         trade.setActivityItemIds(companyVO.getActivityItemIds());
+        // 前台传入 暂时用这个字段
+        trade.setStaffName(companyVO.getStaffNameFrom());
         tradeMapper.insert(trade);
 
         return ResponseResultUtil.success(trade);
@@ -643,6 +653,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         trade.setActivityIds(companyVO.getActivityIds());
         trade.setActivityItemIds(companyVO.getActivityItemIds());
         trade.setTradeDesc(companyVO.getRemarks());
+        // 前台传入 暂时用这个字段
+        trade.setStaffName(companyVO.getStaffNameFrom());
         tradeMapper.insert(trade);
         return ResponseResultUtil.success(trade);
     }

src/main/java/com/dk/oauth/service/wxapi/basic/WechatPayService.java

@@ -189,6 +189,8 @@ public class WechatPayService {
             couponUse.setCouponStatus(Constant.couponStatus.YI_SHI_YONG.getName());
             //核销日期
             couponUse.setUseDate(LocalDateTime.now());
+            // 使用员工
+            couponUse.setUseStaff(trade.getStaffName());
             //更新
             couponUseMapper.update(couponUse,
                     new UpdateWrapper<CouponUse>().lambda()
@@ -196,11 +198,8 @@ public class WechatPayService {
 
         }
 
-        // 使用员工
+        // 使用员工   // 积分的使用
         if (tradeResponse.getIntegral() > 0) {
-            CouponUseResponse couponUseResponse = couponUseMapper.selectById(tradeResponse.getCouponUseId());
-            String staffName = couponUseResponse.getUseStaff();
-            // 积分的使用
             // 积分明细
             IntegralItem integralItem = new IntegralItem();
             integralItem.setIntegralType(Constant.IntegralType.INTEGRAL_TYPE_USE.getName());
@@ -208,7 +207,7 @@ public class WechatPayService {
             integralItem.setCpId(tradeResponse.getCpId());
             integralItem.setAccDate(LocalDateTime.now());
             integralItem.setUserId(trade.getWxUserId());
-            integralItem.setStaffName(staffName);
+            integralItem.setStaffName(trade.getStaffName());
             integralItemMapper.insert(integralItem);
             // 积分 总积分
             Integral integral = new Integral();

src/main/resources/mapper/TradeMapper.xml

@@ -29,6 +29,7 @@
         ,t.activity_item_ids
         ,t.coupon_use_id
         ,t.integral
+        ,t.staff_name
     </sql>
 
     <resultMap type="com.dk.oauth.entity.Trade" id="ResultMap">
@@ -54,6 +55,7 @@
         <result column="activity_item_ids" property="activityItemIds" typeHandler="UuidListTypeHandler"/>
         <result column="coupon_use_id" property="couponUseId" typeHandler="UuidTypeHandler"/>
         <result column="integral" property="integral"/>
+        <result column="staff_name" property="staffName"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -80,6 +82,7 @@
         <result column="activity_ids" property="activityIds" typeHandler="UuidListTypeHandler"/>
         <result column="activity_item_ids" property="activityItemIds" typeHandler="UuidListTypeHandler"/>
         <result column="integral" property="integral"/>
+        <result column="staff_name" property="staffName"/>
     </resultMap>
 
     <!-- 通用条件列 -->