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

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java

@@ -622,7 +622,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
     }
 
     /**
-     * 计算团队极差奖衔
+     * 计算团队等级、奖衔 -- 秒结、日结
      */
     public List<CuMemberAwards> calculateRetailRangeGradeAwards(Integer period, Map<Long, CuMemberRetailRangeExt> memberRangeExtMap, String rangeTableName, SaOrderExt saOrderExt,
                                                                 Map<Integer, BdGrade> retailTeamGradeMap, Map<Integer, BdAwards> retailAwardsMap, String secondRangeTableName,
@@ -645,19 +645,12 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
             }
 
             // 累计盒数、业绩，不管激活不激活都处理，兼容不激活判断显示有问题
-            if (null != secondRangeTableName) {
+            targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().add(boxNum));
-                // 秒结处理
+            targetMemberRangeExt.setAllTeamBoxNum(targetMemberRangeExt.getAllTeamBoxNum().add(boxNum));
-                targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().add(boxNum));
+            targetMemberRangeExt.setAllTeamMonthBoxNum(targetMemberRangeExt.getAllTeamMonthBoxNum().add(boxNum));
-                targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().add(orderAchieve));
+            targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().add(orderAchieve));
-            } else {
+            targetMemberRangeExt.setAllTeamConsumePv(targetMemberRangeExt.getAllTeamConsumePv().add(orderAchieve));
-                // 日结处理
+            targetMemberRangeExt.setAllTeamMonthPv(targetMemberRangeExt.getAllTeamMonthPv().add(orderAchieve));
-                targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().add(boxNum));
-                targetMemberRangeExt.setAllTeamBoxNum(targetMemberRangeExt.getAllTeamBoxNum().add(boxNum));
-                targetMemberRangeExt.setAllTeamMonthBoxNum(targetMemberRangeExt.getAllTeamMonthBoxNum().add(boxNum));
-                targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().add(orderAchieve));
-                targetMemberRangeExt.setAllTeamConsumePv(targetMemberRangeExt.getAllTeamConsumePv().add(orderAchieve));
-                targetMemberRangeExt.setAllTeamMonthPv(targetMemberRangeExt.getAllTeamMonthPv().add(orderAchieve));
-            }
 
             // 激活的账号才能累计业绩和盒数（有注册、升级订单）
             if (targetMemberRangeExt.getEnableStatus() == EYesNo.YES.getIntValue()) {
@@ -751,6 +744,19 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                 }
             }
         }
+
+        if (null != secondRangeTableName) {
+            if (targetMemberRangeExt.getPkMember().equals(saOrderExt.getPkMember())) {
+                // new 兼容购买等级多送2级的问题，秒结处理V4 V5方式不一样，会出现秒结等级和实际等级不匹配
+                CuMemberRetailRangeExt memberRetailLevel = iCuMemberGradeService.getMemberLevel(saOrderExt.getPkMember(), saOrderExt.getPkId());
+                if (null != memberRetailLevel) {
+                    if (memberRetailLevel.getGradeValue() > targetMemberRangeExt.getGradeValue()) {
+                        targetMemberRangeExt.setPkGrade(memberRetailLevel.getPkGrade());
+                    }
+                }
+            }
+        }
+
         // 计算当月奖衔
         while (true) {
             // 当月奖衔值 + 5，获取下一个奖衔值
@@ -771,6 +777,11 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
             }
             break;
         }
+
+        // 校验大小区会员数据
+        List<CuMemberRetailRangeExt> cuMemberRangeExtList = null;
+        // 校验累计小部门会员数据
+        List<CuMemberRetailRangeExt> cuMemberRetailRangeExtList = null;
         // 计算分红奖衔
         while (true) {
             // 当月奖衔值 + 5，获取下一个奖衔值
@@ -780,13 +791,14 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                 // 先验证累计业绩
                 if (ComputeUtil.compareValue(ComputeUtil.computeAdd(targetMemberRangeExt.getTeamMonthPv(), targetMemberRangeExt.getMonthConsumePv()), bdAwards.getShareTotalCheck())) {
                     // 再验证小区，计算小区业绩（拉取直推会员数据）
-                    List<CuMemberRetailRangeExt> cuMemberRangeExtList;
+                    if (null == cuMemberRangeExtList) {
-                    if (secondRangeTableName != null) {
+                        if (null != secondRangeTableName) {
-                        // 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据
+                            // 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据
-                        cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember());
+                            cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberSecondRangeExtByParent(rangeTableName, secondRangeTableName, targetMemberRangeExt.getPkMember());
-                    } else {
+                        } else {
-                        // 昨日结算表，查询订单会员直推数据
+                            // 昨日结算表，查询订单会员直推数据
-                        cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember());
+                            cuMemberRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeExtByParent(rangeTableName, targetMemberRangeExt.getPkMember());
+                        }
                     }
                     // 本人月消费业绩（默认为大区）
                     BigDecimal consumeBigPv = targetMemberRangeExt.getMonthConsumePv();
@@ -808,14 +820,15 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                         // 小区业绩 >= 小区考核业绩
                         if (bdAwards.getPlaceDeptNum() > 0) {
                             // 验证是否有多个区满足业绩
-                            List<CuMemberRetailRangeExt> cuMemberRetailRangeExtList;
+                            if (null == cuMemberRetailRangeExtList) {
-                            // 非秒结需要查询日结相关数据，秒结表使用上面查出的数据就可以
+                                // 非秒结需要查询日结相关数据，秒结表使用上面查出的数据就可以
-                            if (secondRangeTableName != null) {
+                                if (null != secondRangeTableName) {
-                                // 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据
+                                    // 会员表 关联 秒结表 和 昨日结算表，查询订单会员直推数据
-                                cuMemberRetailRangeExtList = cuMemberRangeExtList;
+                                    cuMemberRetailRangeExtList = cuMemberRangeExtList;
-                            } else {
+                                } else {
-                                // 昨日结算表，查询订单会员直推数据
+                                    // 昨日结算表，查询订单会员直推数据
-                                cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck());
+                                    cuMemberRetailRangeExtList = iCuMemberRetailRangeService.queryCuMemberRetailRangeEnoughAchieve(rangeTableName, targetMemberRangeExt.getPkMember(), bdAwards.getShareCommunityCheck());
+                                }
                             }
 
                             int enoughNum = 0;

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberGradeMapper.java

@@ -39,6 +39,15 @@ public interface CuMemberGradeMapper extends BaseMapper<CuMemberGrade> {
      */
     void updateCuMemberGradeLevel(@Param("rangeTableName") String rangeTableName, @Param("pkOrder") Long pkOrder);
 
+    /**
+     * 查询订单升级记录
+     *
+     * @param pkMember
+     * @param pkOrder
+     * @return
+     */
+    CuMemberRetailRangeExt getMemberLevel(@Param("pkMember") Long pkMember, @Param("pkOrder") Long pkOrder);
+
     /**
      * 删除等级
      */

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberGradeService.java

@@ -36,6 +36,15 @@ public interface ICuMemberGradeService extends IService<CuMemberGrade> {
      */
     void updateCuMemberGrade(String rangeTableName, Long pkOrder);
 
+    /**
+     * 查询订单升级记录
+     *
+     * @param pkMember
+     * @param pkOrder
+     * @return
+     */
+    CuMemberRetailRangeExt getMemberLevel(Long pkMember, Long pkOrder);
+
     /**
      * 插入会员等级升级记录
      */

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberGradeServiceImpl.java

@@ -7,7 +7,6 @@ import com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt;
 import com.hzs.common.domain.member.detail.CuMemberGrade;
 import com.hzs.common.domain.member.detail.CuMemberLevel;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -42,7 +41,11 @@ public class CuMemberGradeServiceImpl extends ServiceImpl<CuMemberGradeMapper, C
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    public CuMemberRetailRangeExt getMemberLevel(Long pkMember, Long pkOrder) {
+        return baseMapper.getMemberLevel(pkMember, pkOrder);
+    }
+
+    @Override
     public void insertCuMemberGrade(List<CuMemberGrade> cuMemberGradeList) {
         saveBatch(cuMemberGradeList);
     }

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberGradeMapper.xml

@@ -85,6 +85,18 @@
         a.pk_grade = b.pk_grade
     </update>
 
+    <!-- 查询订单升级记录 -->
+    <select id="getMemberLevel" resultType="com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt">
+        select cml.pk_member, bg.pk_id pk_grade, bg.grade_value
+        from cu_member_level cml
+                 left join bd_grade bg
+                           on bg.pk_id = cml.new_level
+        where cml.del_flag = 0
+          and cml.up_type = 4
+          and cml.pk_member = #{pkMember}
+          and cml.pk_order = #{pkOrder}
+    </select>
+
     <!-- 删除等级 -->
     <delete id="deleteCuMemberGrade">
         update cu_member_grade

bd-third/src/main/resources/bootstrap.yml

@@ -126,30 +126,30 @@ delivery:
 jd:
   bank:
     ## 二级商户号
-    merchantNo: 153428607005
+    merchantNo: 153428607011
     ## 签名密钥
-    signKey: 3d2647236d1c70e25b5acf6b9d903136439e29a06c50a412dc0c7bc3de2ef523
+    signKey: edad31b00269a3c843268f4ff4dab5f079106a328795495922c11f50faf9d0c6
     ## 证书加密密码
-    priCertPwd: bd147258369
+    priCertPwd: bf147258369
     ## 私钥文件名
-    priCert: jd/merchantCert005.pfx
+    priCert: jd/merchantCert011.pfx
     ## 公钥文件名
     pubCert: jd/npp_11_API2_pro.cer
     ## 生产环境api接口域名
     apiDomain: http://wapi.jd.com
     ## 页面回调地址
     #    pageBackUrl: https://t-app.beida666.com/prod-api/pay/jd/sync-notify
-    pageBackUrl: http://t-app.beida666.com/#/pages/pay/success
+    pageBackUrl: http://t-app.beida777.com/#/pages/pay/success
     ## 支付回调地址
-    notifyUrl: https://t-app.beida666.com/prod-api/pay/jd/trade-notify
+    notifyUrl: https://t-app.beida777.com/prod-api/pay/jd/trade-notify
     #    notifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd/trade-notify
     ## 退款回调地下
-    refundNotifyUrl: https://t-app.beida666.com/prod-api/pay/jd-refund/trade-notify
+    refundNotifyUrl: https://t-app.beida777.com/prod-api/pay/jd-refund/trade-notify
     #    refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
     separateAccounts:
-      - account: 153428607007
+      - account: 153428607011
         proportion: 0.5
-      - account: 153428607005
+      - account: 153428607013
         proportion: 0.5
   wechat-alipay:
     ## 二级商户号