v1.0.7

src/main/java/com/caimei365/order/service/impl/HeliPayServiceImpl.java

@@ -423,53 +423,6 @@ public class HeliPayServiceImpl implements HeliPayService {
                 cmReportingMemberMapper.updateCmReportingMember(s);
             });
         }
-        //当前版本无法线上走充值/订金订单
-        // 商品数据
-//        List<OrderProductVo> orderProductList = orderCommonMapper.getOrderProductByOrderId(orderId);
-        // 判断是否是充值商品
-//        int rechargeFlag = 0;
-//        // 缴纳订金订单
-//        int[] productId1 = {6060, 6061, 6062, 6063, 6064};
-//        // 充值余额订单
-//        int[] productId2 = {6065, 6066, 6067, 6068, 6069};
-//        for (OrderProductVo product : orderProductList) {
-//            if (ArrayUtils.contains(productId1, product.getProductId())) {
-//                rechargeFlag = 1;
-//                break;
-//            }
-//            if (ArrayUtils.contains(productId2, product.getProductId())) {
-//                rechargeFlag = 2;
-//                break;
-//            }
-//        }
-//        if (rechargeFlag > 0) {
-//            // 账户余额
-//            double oldUserMoney = baseMapper.getUserMoney(order.getUserId());
-//            double userMoney = MathUtil.add(oldUserMoney, amount).doubleValue();
-//            // 可用余额
-//            Double oldAvailableMoney = baseMapper.getAbleUserMoney(order.getUserId());
-//            double availableMoney = MathUtil.add(oldAvailableMoney, amount).doubleValue();
-//            payOrderMapper.updateMoneyByUserId(userMoney, availableMoney, order.getUserId());
-//            log.info("【支付异步回调】>>>>>>>>>>>更新用户余额(update[user])userId：" + order.getUserId() + "，orderId：" + orderId);
-//            //保存余额到余额收支记录
-//            BalanceRecordPo balanceRecord = new BalanceRecordPo();
-//            balanceRecord.setUserId(order.getUserId());
-//            balanceRecord.setType(1);
-//            if (rechargeFlag == 1) {
-//                balanceRecord.setBalanceType(6);
-//            } else {
-//                balanceRecord.setBalanceType(7);
-//            }
-//            balanceRecord.setAddDate(new Date());
-//            balanceRecord.setAmount(amount);
-//            balanceRecord.setOrderId(orderId);
-//            balanceRecord.setRemark("订单商品充值余额");
-//            balanceRecord.setDelFlag(0);
-//            // 保存 余额收支记录
-//            baseMapper.insertBalanceRecord(balanceRecord);
-//            log.info("【支付异步回调】>>>>>>>>>>>>>>>>>>>>>>>>>>订单商品充值余额(insert[cm_user_balance_record])orderId：" + orderId);
-//        }
-
         // 线上支付与自主下单送豆（已全部收款），最后一笔线上支付成功后，赠送200采美豆
         if (3 == order.getReceiptStatus() && 0 == order.getSecondHandOrderFlag()&&identity != 8) {
             UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
@@ -529,18 +482,6 @@ public class HeliPayServiceImpl implements HeliPayService {
             baseMapper.updateUserBeans(beansHistory.getUserId(), userBeans);
             log.info("【支付异步回调】>>>>>更新用户采美豆(update[user(userBeans:" + userBeans + ")])，userId:" + beansHistory.getUserId());
         }
-        // 已支付短信推送 不是本地或者测试
-//        boolean smsPushFlag = !orderRequestNo.contains("BETA") && !orderRequestNo.contains("DEV");
-//        String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());
-//        if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
-//            String shortLink = remoteCallService.getShortLink(8, 6, "https://www.caimei365.com/user/order/detail.html?orderId=" + orderId);
-//            String content = "您已成功支付订单（订单编号：" + order.getOrderNo() + "）全部款项，支付总金额￥" + order.getPayTotalFee() + "，采美平台将立即安排发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
-//                    "平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
-//            boolean sendSms = remoteCallService.getSendSms(6, bindMobile, content);
-//            if (!sendSms) {
-//                log.info("取消订单推送失败，orderId>>>>" + orderId);
-//            }
-//        }
         return "SUCCESS";
     }