chenjiahe
2024-01-29 67687a43936a3359f01d0fe84ff6d76b1ce32356
再生俱乐部提交-返佣
2个文件已修改
13 ■■■■■ 已修改文件
phi_platform_common/src/main/java/com/hx/phip/service/tool/club/UserCluebMemberServiceTool.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/util/api/OrderPayMoneyUtil.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/java/com/hx/phip/service/tool/club/UserCluebMemberServiceTool.java
@@ -141,8 +141,9 @@
        //退款订单状态判断,有其他原因,必须要判断是否退款完成
        int whileNum = 0;
        RefundRecord refundRecord;
        while (true){
            RefundRecord refundRecord = commonService.selectOneByKey(RefundRecordMapper.class,refundId);
            refundRecord = commonService.selectOneByKey(RefundRecordMapper.class,refundId);
            //退款状态是成功的
            if(refundRecord.getRefundStatus() == RefundStatus.STATUS_SUCC_REFUND){
                break;
@@ -297,8 +298,9 @@
        //退款订单状态判断,有其他原因,必须要判断是否退款完成
        int whileNum = 0;
        RefundRecord refundRecord;
        while (true){
            RefundRecord refundRecord = commonService.selectOneByKey(RefundRecordMapper.class,refundId);
            refundRecord = commonService.selectOneByKey(RefundRecordMapper.class,refundId);
            //退款状态是作废的
            if(refundRecord.getRefundStatus() == RefundStatus.STATUS_REFUND_CANCEL){
                break;
phi_platform_user/src/main/java/com/hx/phip/util/api/OrderPayMoneyUtil.java
@@ -2072,7 +2072,8 @@
        values.put("type",UserClubMember.TYPE_REGENERATION);
        values.put("userId",inviteeUser.getId());
        values.put("newDate",new Date());
        sqlSentence.sqlSentence("SELECT * FROM user_club_member WHERE isDel = 0 AND type = #{m.type} AND userId = #{m.userId}" +
        values.put("status",UserClubMember.STATUS_NORMAL);
        sqlSentence.sqlSentence("SELECT * FROM user_club_member WHERE isDel = 0 AND status = #{m.status} AND type = #{m.type} AND userId = #{m.userId}" +
                " AND (durationType = 0 OR (durationType = 1 AND startTime >= #{m.newDate} AND #{m.newDate} <= endTime)) ORDER BY durationType ASC,endTime DESC LIMIT 1",values);
        UserClubMember userClubMember = commonService.selectOneByKey(UserClubMemberMapper.class,sqlSentence);
@@ -2089,7 +2090,7 @@
        //被邀请人获得比例%
        Integer beInviterPercent = null;
        if(userClubMember != null){
            //有俱乐部会员优先处理
            //---有俱乐部会员优先处理
            if(ordersTotal.getOrderInfo().getIsOldBringNew() !=null && ordersTotal.getOrderInfo().getIsOldBringNew().equals(BaseEntity.YES)){
                //----初复诊订单
                inviterPercent = 10;
@@ -2149,7 +2150,7 @@
        
        //统计订单现金总金额
        BigDecimal moneyPay=orderInfo.getSnapPayTotal();
        orderNodeBuilder.append("-老带新现金金额:¥").append(moneyPay);
        orderNodeBuilder.append("-老带新订单现金金额:¥").append(moneyPay);
        BigDecimal beInviterMoney = BigDecimal.ZERO;
        BigDecimal inviterMoney = BigDecimal.ZERO;