线上余额剔除

src/main/java/com/caimei365/order/components/ProductService.java

@@ -355,11 +355,6 @@ public class ProductService {
         relation.setAssociateAmount(balancePayFee);
         relation.setRelationType(2);
         relation.setDelFlag(0);
-        String s = "YE" + new SimpleDateFormat("yyyyMMddHHmmssSSS") + "T" + orderId;
-        //todo 余额抵扣订单产生时未产生第三方平台交易，无流水号和唯一订单号，暂自定义相同，防止分账存参数空指针(线上/下余额改版)
-        relation.setMbOrderId(s);
-        relation.setOrderRequestNo(s);
-        relation.setSplitStatus(0);
         // 保存 收款项和订单关系
         baseMapper.insertOrderReceiptRelation(relation);
         log.info(note + ">>>>>>>>>>>收款项和订单关系(insert[cm_receipt_order_relation])id：" + relation.getId() + "，orderId：" + orderId);

src/main/java/com/caimei365/order/mapper/BaseMapper.java

@@ -225,14 +225,6 @@ public interface BaseMapper {
     UserBeansHistoryPo findLowOrder(Integer orderId);
 
     Integer findBeans(Integer userId);
-
-    //根据orderid找paytype
-    String findPayType(String orderId);
-    //根据mborderid找paytype
-    String findType(String mbOrderId);
-
-    Double getonlineMoney(Integer userId);
-
     /**
      * 查询认证通用户名称
      * @param userId

src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -156,10 +156,6 @@ public interface OrderCommonMapper {
      */
     Date getUserRegisterTime(Integer userId);
 
-    Double findUserMoney(Integer orderId);
-
-    Double findOnlineMoney(Integer orderId);
-
     Integer finduserBean(Integer orderId);
 
     Integer findSplitCode(Integer orderId);

src/main/java/com/caimei365/order/mapper/PayOrderMapper.java

@@ -33,25 +33,15 @@ public interface PayOrderMapper {
      * @param order 主订单
      */
     void updateOrderStatus(OrderVo order);
-
-    void updateUserMoney(Double userMoney, Double ableUserMoney,Integer userId);
     /**
      * 根据用户Id更新余额
      * @param userMoney      用户余额
      * @param ableUserMoney 用户可用余额
      * @param userId 用户Id
      */
-    void updateMoneyByUserId(Double userMoney, Double ableUserMoney,Double onlineMoney,Integer userId);
+    void updateMoneyByUserId(Double userMoney, Double ableUserMoney,Integer userId);
 
     void updateAbleMoney( Double ableUserMoney,Integer userId);
-    /**
-     * 根据用户Id更新线上余额
-     *
-     * @param onlineMoney   线上用户余额
-     * @param ableUserMoney 用户可用余额
-     * @param userId        用户Id
-     */
-    void updateOnlineMoneyByUserId(Double onlineMoney, Double ableUserMoney, Integer userId);
     /**
      * 订单支付链接
      * @param orderId 订单Id
@@ -189,14 +179,6 @@ public interface PayOrderMapper {
     void updateVipPackageRecord(VipRecordBo record);
 
     List<BankCodeVo> findBankCode();
-    /**
-     * 获取线上余额分账
-     *
-     * @param currentTime
-     * @return
-     */
-    List<OrderReceiptRelationPo> getOnlineBalance(String currentTime);
-
     /**
      * 查询认证通会员开通历史记录
      * @param authVipRecordId

src/main/java/com/caimei365/order/model/bo/OrderParamBo.java

@@ -117,8 +117,4 @@ public class OrderParamBo implements Serializable {
      * 超级会员用户标记
      */
     private Boolean svipUserFlag;
-    /**
-     * 线上余额
-     */
-    private Double onlineMoney;
 }

src/main/java/com/caimei365/order/model/po/BalanceRecordPo.java

@@ -27,7 +27,7 @@ public class BalanceRecordPo implements Serializable {
      */
     private Integer type;
     /**
-     * 余额类型：1线下余额抵扣，2多收退款到余额，3申请退款,4余额充值，5余额提现,6订金订单充值,7余额订单充值,8订金订单退款,9余额订单退款,10线上余额抵扣,16线上订金订单充值,17线上余额订单充值
+     * 余额类型：1线下余额抵扣，2多收退款到余额，3申请退款,4余额充值，5余额提现,6订金订单充值,7余额订单充值,8订金订单退款,9余额订单退款
      */
     private Integer balanceType;
     /**

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

@@ -194,64 +194,22 @@ public class PayOrderServiceImpl implements PayOrderService {
                 //保存收款记录
                 productService.saveDiscernReceipt(balancePayFee, orderId, "【订单支付,余额抵扣】");
             }
-            //可用=可用-本次抵扣
             availableMoney = MathUtil.sub(availableMoney, balancePayFee).doubleValue();
-            //区分扣多少线上扣多少线下，优先线上余额
-            Double onlineMoney = baseMapper.getonlineMoney(order.getUserId());
-            //线上余额>本次抵扣，全抵线上
-            if (onlineMoney > balancePayFee) {
-                onlineMoney = MathUtil.sub(onlineMoney, balancePayFee).doubleValue();
-                payOrderMapper.updateOnlineMoneyByUserId(onlineMoney, availableMoney, order.getUserId());
-                log.info("【订单支付,余额抵扣】>>>>>>>>>>>更新用户余额(update[user])userId：" + order.getUserId() + "，orderId：" + orderId);
-                //保存余额到余额收支记录
-                BalanceRecordPo balanceRecord = new BalanceRecordPo();
-                balanceRecord.setUserId(order.getUserId());
-                balanceRecord.setType(2);
-                balanceRecord.setBalanceType(10);
-                balanceRecord.setAddDate(new Date());
-                balanceRecord.setAmount(balancePayFee);
-                balanceRecord.setOrderId(orderId);
-                balanceRecord.setRemark("订单支付,余额抵扣");
-                balanceRecord.setDelFlag(0);
-                // 保存 余额收支记录
-                baseMapper.insertBalanceRecord(balanceRecord);
-                log.info("【订单支付,余额抵扣】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + orderId);
-            } else {//线上不够，线上全抵，剩余线下
-                //线下=原线下-（本次抵扣-线上）
-                userMoney = MathUtil.sub(userMoney, MathUtil.sub(balancePayFee, onlineMoney)).doubleValue();
-                //更新线上/线下余额  线上置为0，全部抵扣
-                payOrderMapper.updateMoneyByUserId(userMoney, availableMoney, 0d, order.getUserId());
-                log.info("【订单支付,余额抵扣】>>>>>>>>>>>更新用户余额(update[user])userId：" + order.getUserId() + "，orderId：" + orderId);
-                if (onlineMoney > 0) {
-                    // 线上>0有抵扣的情况下保存线上余额到余额收支记录
-                    BalanceRecordPo balanceRecord = new BalanceRecordPo();
-                    balanceRecord.setUserId(order.getUserId());
-                    balanceRecord.setType(2);
-                    balanceRecord.setBalanceType(10);
-                    balanceRecord.setAddDate(new Date());
-                    balanceRecord.setAmount(onlineMoney);
-                    balanceRecord.setOrderId(orderId);
-                    balanceRecord.setRemark("订单支付,余额抵扣");
-                    balanceRecord.setDelFlag(0);
-                    baseMapper.insertBalanceRecord(balanceRecord);
-                    log.info("【订单支付,线上/线下余额抵扣】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + orderId);
-                }
-                if (userMoney > 0) {
-                    // 保存线下余额到余额收支记录
-                    BalanceRecordPo balanceRecord1 = new BalanceRecordPo();
-                    balanceRecord1.setUserId(order.getUserId());
-                    balanceRecord1.setType(2);
-                    balanceRecord1.setBalanceType(1);
-                    balanceRecord1.setAddDate(new Date());
-                    balanceRecord1.setAmount(userMoney);
-                    balanceRecord1.setOrderId(orderId);
-                    balanceRecord1.setRemark("订单支付,余额抵扣");
-                    balanceRecord1.setDelFlag(0);
-                    // 保存 余额收支记录
-                    baseMapper.insertBalanceRecord(balanceRecord1);
-                }
-                log.info("【订单支付,线上/线下余额抵扣】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + orderId);
-            }
+            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(2);
+            balanceRecord.setBalanceType(1);
+            balanceRecord.setAddDate(new Date());
+            balanceRecord.setAmount(balancePayFee);
+            balanceRecord.setOrderId(orderId);
+            balanceRecord.setRemark("订单支付,余额抵扣");
+            balanceRecord.setDelFlag(0);
+            // 保存 余额收支记录
+            baseMapper.insertBalanceRecord(balanceRecord);
+            log.info("【订单支付,余额抵扣】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + orderId);
         }
         Map<String, Object> map = new HashMap<>(2);
         map.put("order", order);
@@ -344,20 +302,7 @@ public class PayOrderServiceImpl implements PayOrderService {
 //        orderCommonService.getDiscernReceiptAndSetOrder(order);
 //        boolean payButton = order.isPayButton();
 
-        //判断线上/线下余额
-//        Double userMoney = orderCommonMapper.findUserMoney(orderId);
-//        Double onlineMoney = orderCommonMapper.findOnlineMoney(orderId);
-//        userMoney = userMoney == null ? 0 : userMoney;
-//        onlineMoney = onlineMoney == null ? 0 : onlineMoney;
-//        if (MathUtil.compare(totalCostPrice, order.getPayableAmount()) > 0 || order.getPayableAmount() <= 0.01) {
-//            map.put("onlinePay", 2);
-//        } else if (userMoney > 0 && onlineMoney > 0 && !"31".equals(order.getStatus())) {
-//            //当线上余额和线下余额两者都抵扣了但只抵扣了部分订单金额，订单只能走线下支付，点击提交订单，跳转到线下支付页面
-//            map.put("onlinePay", 2);
-//        } else {
-//            map.put("onlinePay", 1);
-//        }
-        //线上支付优化，订单商品中有没设置分帐帐号的无法线上
+        //todo 线上支付优化，订单商品中有没设置分帐帐号的无法线上
         Integer num = orderCommonMapper.findSplitCode(orderId);
         if (num > 0) {
             map.put("onlinePay", 2);
@@ -909,25 +854,22 @@ public class PayOrderServiceImpl implements PayOrderService {
             }
         }
         if (rechargeFlag > 0) {
-            // 线上账户余额
-            double oldUserMoney = baseMapper.getonlineMoney(order.getUserId());
-            // 充值算线下余额
+            // 账户余额
+            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.updateOnlineMoneyByUserId(userMoney, availableMoney, order.getUserId());
+            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(16);
+                balanceRecord.setBalanceType(6);
             } else {
-                balanceRecord.setBalanceType(17);
+                balanceRecord.setBalanceType(7);
             }
             balanceRecord.setAddDate(new Date());
             balanceRecord.setAmount(amount);
@@ -1107,14 +1049,6 @@ public class PayOrderServiceImpl implements PayOrderService {
         String currentTime = format.format(calendar.getTime());
         // 查询未分账已支付收款
         List<OrderReceiptRelationPo> orderRelations = payOrderMapper.getUndividedPaidReceipt(currentTime);
-        // 上面过滤了余额抵扣， 把线上余额抵扣单补充到list里面，线上余额抵扣的金额视为正常收款金额进行分账
-        List<OrderReceiptRelationPo> onlineRelations = payOrderMapper.getOnlineBalance(currentTime);
-        if (null != onlineRelations && onlineRelations.size() > 0) {
-            // 过滤不足分账金额的单
-            onlineRelations.removeIf(o -> o.getAssociateAmount() < 0.01);
-            // 把线上余额抵扣订单加入分账
-            orderRelations.addAll(onlineRelations);
-        }
         if (null != orderRelations && orderRelations.size() > 0) {
             for (OrderReceiptRelationPo orderRelation : orderRelations) {
                 log.info("【延时分账】>>>>>>>>>>订单id:" + orderRelation.getOrderId() + ",进入延时分账");

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

@@ -967,50 +967,39 @@ public class SubmitServiceImpl implements SubmitService {
         boolean isPaySuccessFlag = false;
         // 余额支付标识，0不使用，1使用
         if (1 == orderParamBo.getBalancePayFlag()) {
-            // 订单总额>账户余额 部分抵扣
+            // 抵扣后用户剩余可用余额
+            Double lastAbleUserMoney;
+            // 抵扣后账户余额
+            Double lastUserMoney = orderParamBo.getUserMoney();
+            // 部分抵扣
             if (MathUtil.compare(payTotalFee.get(), orderParamBo.getAbleUserMoney()) > 0) {
                 balancePayFee.set(orderParamBo.getAbleUserMoney());
                 payableAmount.set(MathUtil.sub(payTotalFee.get(), balancePayFee.get()).doubleValue());
+                // 余额抵扣用完
+                lastAbleUserMoney = 0d;
                 if (3 != orderParamBo.getCartType()) {
                     // 部收款待发货
                     mainOrder.setStatus(21);
-                    //非协销下单，直接扣
-                    // 线上+线下只够部分抵扣，线上线下可用都置为0
-                    payOrderMapper.updateMoneyByUserId(0d, 0d, 0d, orderParamBo.getUserId());
-                    log.info("【提交订单】>>>>>更新用户余额，抵扣后剩余：[userMoney:" + 0 + "] ,ableUserMoney:" + 0);
-                }else{
-                    //协销下单，只扣可用余额
-                    payOrderMapper.updateAbleMoney(0d, orderParamBo.getUserId());
+                    lastUserMoney = MathUtil.sub(orderParamBo.getUserMoney(), balancePayFee.get()).doubleValue();
                 }
                 mainOrder.setReceiptStatus(2);
             } else {
                 // 全部用余额抵扣， 直接变成支付完成
                 balancePayFee.set(payTotalFee.get());
                 payableAmount.set(0d);
-                Double availableMoney = MathUtil.sub(orderParamBo.getAbleUserMoney(), balancePayFee).doubleValue();
+                lastAbleUserMoney = MathUtil.sub(orderParamBo.getAbleUserMoney(), balancePayFee.get()).doubleValue();
                 if (3 != orderParamBo.getCartType()) {
                     // 已收款待发货
                     mainOrder.setStatus(31);
-                    //非协销下单，直接扣
-                    // 线上余额全付
-                    if (MathUtil.compare(orderParamBo.getOnlineMoney(), balancePayFee) > 0) {
-                        Double onlineMoney = MathUtil.sub(orderParamBo.getOnlineMoney(), balancePayFee).doubleValue();
-                        payOrderMapper.updateOnlineMoneyByUserId(onlineMoney, availableMoney, orderParamBo.getUserId());
-                        log.info("【提交订单】>>>>>更新用户余额，抵扣后剩余：[userMoney:" + availableMoney + "] ,ableUserMoney:" + availableMoney);
-                    } else {
-                        //线上余额不够，线上全抵
-                        Double userMoney = MathUtil.sub(orderParamBo.getUserMoney(), MathUtil.sub(balancePayFee, orderParamBo.getOnlineMoney())).doubleValue();
-                        //更新线上/线下余额  线上置为0，全部抵扣
-                        payOrderMapper.updateMoneyByUserId(userMoney, MathUtil.sub(orderParamBo.getAbleUserMoney(), balancePayFee).doubleValue(), 0d, orderParamBo.getUserId());
-                    }
-                }else{
-                    //协销下单，只扣可用余额，确认订单在扣usermoney和onlinemoney
-                    payOrderMapper.updateAbleMoney(availableMoney, orderParamBo.getUserId());
+                    lastUserMoney = MathUtil.sub(orderParamBo.getUserMoney(), balancePayFee.get()).doubleValue();
                 }
                 mainOrder.setReceiptStatus(3);
                 mainOrder.setPayFlag(1);
                 isPaySuccessFlag = true;
             }
+            // 抵扣后更新用户余额
+            submitMapper.updateUserMoney(lastUserMoney, lastAbleUserMoney, orderParamBo.getUserId());
+            log.info("【提交订单】>>>>>更新用户余额，抵扣后剩余：[userMoney:" + lastUserMoney + "] ,ableUserMoney:" + lastAbleUserMoney);
             // 支付时间
             mainOrder.setPayTime(curDateStr);
         } else {
@@ -1292,52 +1281,19 @@ public class SubmitServiceImpl implements SubmitService {
          */
         // 余额支付标识，0不使用，1使用
         if (1 == orderParamBo.getBalancePayFlag() && MathUtil.compare(balancePayFee.get(), 0) > 0) {
-            Double onlineMoney = orderParamBo.getOnlineMoney();
-            if (MathUtil.compare(onlineMoney, balancePayFee) > 0) {
-                //保存余额到余额收支记录
-                BalanceRecordPo balanceRecord = new BalanceRecordPo();
-                balanceRecord.setUserId(orderParamBo.getUserId());
-                balanceRecord.setType(2);
-                balanceRecord.setBalanceType(10);
-                balanceRecord.setAddDate(new Date());
-                balanceRecord.setAmount(balancePayFee.doubleValue());
-                balanceRecord.setOrderId(mainOrder.getOrderId());
-                balanceRecord.setRemark("订单支付,余额抵扣");
-                balanceRecord.setDelFlag(0);
-                // 保存 余额收支记录
-                baseMapper.insertBalanceRecord(balanceRecord);
-                log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + mainOrder.getOrderId());
-            } else {//线上不够，线上全抵，剩余线下
-                if (onlineMoney > 0) {
-                    // 线上>0有抵扣的情况下保存线上余额到余额收支记录
-                    BalanceRecordPo balanceRecord = new BalanceRecordPo();
-                    balanceRecord.setUserId(orderParamBo.getUserId());
-                    balanceRecord.setType(2);
-                    balanceRecord.setBalanceType(10);
-                    balanceRecord.setAddDate(new Date());
-                    balanceRecord.setAmount(onlineMoney);
-                    balanceRecord.setOrderId(mainOrder.getOrderId());
-                    balanceRecord.setRemark("订单支付,余额抵扣");
-                    balanceRecord.setDelFlag(0);
-                    baseMapper.insertBalanceRecord(balanceRecord);
-                    log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + mainOrder.getOrderId());
-                }
-                if (MathUtil.sub(balancePayFee, orderParamBo.getOnlineMoney()).doubleValue() > 0) {
-                    // 保存线下余额到余额收支记录
-                    BalanceRecordPo balanceRecord1 = new BalanceRecordPo();
-                    balanceRecord1.setUserId(orderParamBo.getUserId());
-                    balanceRecord1.setType(2);
-                    balanceRecord1.setBalanceType(1);
-                    balanceRecord1.setAddDate(new Date());
-                    balanceRecord1.setAmount(MathUtil.sub(balancePayFee, orderParamBo.getOnlineMoney()).doubleValue());
-                    balanceRecord1.setOrderId(mainOrder.getOrderId());
-                    balanceRecord1.setRemark("订单支付,余额抵扣");
-                    balanceRecord1.setDelFlag(0);
-                    // 保存 余额收支记录
-                    baseMapper.insertBalanceRecord(balanceRecord1);
-                    log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + mainOrder.getOrderId());
-                }
-            }
+            //保存余额到余额收支记录
+            BalanceRecordPo balanceRecord = new BalanceRecordPo();
+            balanceRecord.setUserId(mainOrder.getUserId());
+            balanceRecord.setType(2);
+            balanceRecord.setBalanceType(1);
+            balanceRecord.setAddDate(new Date());
+            balanceRecord.setAmount(balancePayFee.get());
+            balanceRecord.setOrderId(mainOrder.getOrderId());
+            balanceRecord.setRemark("机构自主订单");
+            balanceRecord.setDelFlag(0);
+            // 保存 余额收支记录
+            baseMapper.insertBalanceRecord(balanceRecord);
+            log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>新增用户余额收支记录(insert[cm_user_balance_record])orderId：" + mainOrder.getOrderId());
             // 保存余额抵扣到收款记录（自主订单）
             if (3 != orderParamBo.getCartType()) {
                 Integer orderId = mainOrder.getOrderId();

src/main/resources/mapper/BaseMapper.xml

@@ -338,9 +338,6 @@
     <select id="findBeans" resultType="java.lang.Integer">
         select userBeans from user where userID=#{userId}
     </select>
-    <select id="getonlineMoney" resultType="java.lang.Double">
-        select onlineMoney FROM USER WHERE userId = #{userId}
-    </select>
     <select id="getAuthUser" resultType="com.caimei365.order.model.vo.AuthUserVo">
         select authUserId,name,mobile
         from cm_brand_auth_user

src/main/resources/mapper/OrderCommonMapper.xml

@@ -555,20 +555,6 @@
     <select id="getUserRegisterTime" resultType="java.util.Date">
         select registerTime from user where userID = #{userId}
     </select>
-    <select id="findUserMoney" resultType="java.lang.Double">
-        SELECT SUM(amount)
-        FROM cm_user_balance_record
-        WHERE orderId = #{orderId}
-          AND balanceType = 1
-          AND delflag = 0
-    </select>
-    <select id="findOnlineMoney" resultType="java.lang.Double">
-        SELECT SUM(amount)
-        FROM cm_user_balance_record
-        WHERE orderId = #{orderId}
-          AND balanceType = 10
-          AND delflag = 0
-    </select>
     <select id="finduserBean" resultType="java.lang.Integer">
         select userBeans from cm_order where orderID = #{orderId}
     </select>

src/main/resources/mapper/PayOrderMapper.xml

@@ -28,8 +28,7 @@
     <update id="updateMoneyByUserId">
         UPDATE USER
         SET userMoney     = #{userMoney},
-            ableUserMoney = #{ableUserMoney},
-            onlineMoney   = #{onlineMoney}
+            ableUserMoney = #{ableUserMoney}
         WHERE userID = #{userId}
     </update>
     <update id="updateAbleMoney">
@@ -117,12 +116,6 @@
         payStatus = #{payStatus}
         WHERE orderID = #{orderId}
     </update>
-    <update id="updateOnlineMoneyByUserId">
-        UPDATE USER
-        SET onlineMoney   = #{onlineMoney},
-            ableUserMoney = #{ableUserMoney}
-        WHERE userID = #{userId}
-    </update>
     <update id="updateUserMoney">
         UPDATE USER
         SET userMoney     = #{userMoney},
@@ -304,33 +297,6 @@
         select id, bankName, B2C, B2B, bankLogo, delFlag
         from cm_bankcode
     </select>
-    <select id="getOnlineBalance" resultType="com.caimei365.order.model.po.OrderReceiptRelationPo">
-        SELECT DISTINCT cror.id,
-                        cror.relationType,
-                        cror.receiptId,
-                        cror.associateAmount,
-                        cror.orderId,
-                        cror.delFlag,
-                        cror.mbOrderId,
-                        cror.orderRequestNo,
-                        cror.splitStatus,
-                        cdr.payType
-        FROM cm_receipt_order_relation cror
-                 LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-                 LEFT JOIN cm_order co ON cror.orderID = co.orderID
-                 LEFT JOIN cm_user_balance_record cubr ON cubr.orderId = cror.orderID
-        WHERE cror.relationType = 2
-          AND cror.delFlag = 0
-          AND cror.splitStatus = 0
-          AND cdr.delFlag = 0
-          AND cdr.payWay = 3
-          AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
-          AND co.organizeID = 0
-          AND co.orderType != 2
-          AND co.refundType != 2
-          AND cubr.balanceType = 10
-          AND cror.associateAmount > 0.01
-    </select>
     <select id="getCouponPrice" resultType="java.lang.Double">
         select moneyCouponPrice from cm_coupon where id = #{couponId}
     </select>

src/main/resources/mapper/SubmitMapper.xml

@@ -174,7 +174,6 @@
                bindMobile,
                userMoney,
                ableUserMoney,
-               onlineMoney,
                userBeans
         FROM user
         WHERE userID = #{userId}