## Opt - 在线支付明细增加体系名称&体系查询条件

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

@@ -730,6 +730,11 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
             for (SaOrderExt saOrderExt : purchaseOrderList) {
                 // 来源会员
                 CuMemberSettleExt sourceMemberSettleExt = cuMemberSettleExtMap.get(saOrderExt.getPkMember());
+                // 处理会员复购业绩
+                sourceMemberSettleExt.setRepurchaseAmount(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseAmount(), saOrderExt.getOrderAmount()));
+                sourceMemberSettleExt.setRepurchasePv(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchasePv(), saOrderExt.getOrderAchieve()));
+                sourceMemberSettleExt.setRepurchaseNewAmount(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseNewAmount(), saOrderExt.getOrderAmount()));
+                sourceMemberSettleExt.setRepurchaseNewPv(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseNewPv(), saOrderExt.getOrderAchieve()));
                 // 订单产生的见点收益
                 List<CuMemberBonusCoach> orderBonusCoachList = new ArrayList<>();
 

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java

@@ -53,7 +53,7 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl<CuMemberMapper, CuMem
                     .eq(CuMember::getMemberCode,deleteDeadLockParam.getMemberCode())
                     .set(CuMember::getPkModified,userId)
                     .set(CuMember::getModifiedTime,date)
-                    .set(CuMember::getDelFlag, EDelFlag.DELETE));
+                    .set(CuMember::getDelFlag, EDelFlag.DELETE.getValue()));
             // 删除会员账户
             iCuMemberAccountService.deleteCuMemberAccountByMemberCode(userId,date,deleteDeadLockParam.getMemberCode());
         } else {

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java

@@ -32,6 +32,14 @@ public class TOnlinePaymentExt extends TOnlinePayment {
 
     private Integer orderType;
     private String orderTypeVal;
+    /**
+     * 体系ID
+     */
+    private Integer vertexId;
+    /**
+     * 体系名称
+     */
+    private String vertexName;
 
     private Long rechargeId;
 

bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java

@@ -71,4 +71,5 @@ public class OnlinePaymentParam {
      */
     private Integer orderType;
 
+    private Integer vertexId;
 }

bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java

@@ -39,7 +39,11 @@ public class OnlinePaymentVO {
      */
     @Excel(name = "会员姓名")
     private String memberName;
-
+    /**
+     * 体系名称
+     */
+    @Excel(name = "体系名称")
+    private String vertexName;
     /**
      * 业务类型（1=直销订单,3=充值,4=抽奖）
      */

bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml

@@ -31,14 +31,20 @@
     <!-- 查询列表 -->
     <select id="queryList" resultType="com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt">
         select top.*, cm.member_code, cm.member_name,smr.Pk_id as rechargeId,
-        so.order_type orderType
+        so.order_type orderType,
+        bv.VERTEX_NAME,
+        bv.pk_id VERTEX_id
         from T_ONLINE_PAYMENT top
         left join cu_member cm
         on cm.pk_id = top.pk_creator
         left join sa_order so on so.ORDER_CODE = top.business_code
         left join cu_member_recharge smr on smr.RECHARGE_CODE = top.business_code
+        left join BD_VERTEX bv on bv.pk_id = cm.PK_VERTEX
         where top.del_flag = 0
         and top.pk_country = #{pkCountry}
+        <if test="param.vertexId != null">
+            and bv.pk_id = ${param.vertexId}
+        </if>
         <if test="param.memberCode != null and param.memberCode != ''">
             and cm.member_code like #{param.memberCode} || '%'
         </if>