Revert "线上/下余额退款"

This reverts commit 21ba23fc

版本回退

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -495,24 +495,16 @@ public class CmRefundsProductController extends BaseController {
                 }
                 cmReturnedPurchase.setRefundOnlineFee(refundOnlineFee);
                 cmReturnedPurchase.setRefundBalanceFee(newOrder.getBalancePayFee());
-            } else if ("1".equals(cmReturnedPurchase.getReturnedWay()) && cmReturnedPurchase.getRefundBalanceFee() == 0d) {
-                //可以线上退款的时候选择退余额进这里
-                //退线下余额
-                Double refundBalanceFee = newOrder.getUserMoney();
-                //退线上余额
-                Double refundOnlineBalanceFee = newOrder.getOnlineMoney();
-                //退线上余额加线上付款金额
-                Double onlinePay=cmDiscernReceiptDao.findOnlinePay(newOrder.getOrderID());
-                refundOnlineBalanceFee=MathUtil.add(refundOnlineBalanceFee,onlinePay).doubleValue();
-                //减已退线下
+            } else if ("1".equals(cmReturnedPurchase.getReturnedWay()) && cmReturnedPurchase.getRefundOnlineFee() == 0d) {
+                Double userMoney = cmDiscernReceiptDao.findUserMoney(newOrder.getOrderID().toString());
                 Double refundUserMoney = cmDiscernReceiptDao.findRefundUserMoney(newOrder.getOrderID().toString());
                 refundUserMoney = null == refundUserMoney ? 0 : refundUserMoney;
-                refundBalanceFee = MathUtil.sub(refundBalanceFee, refundUserMoney).doubleValue();
-                //暂不考虑线下支付会进这
+                userMoney = null == userMoney ? 0 : userMoney;
+                userMoney -= refundUserMoney;
                 //线上支付,全部退余额
-                cmReturnedPurchase.setRefundBalanceFee(refundBalanceFee);
+                cmReturnedPurchase.setRefundBalanceFee(refundFee);
                 //本次支付剩余退到线上余额（线上余额支付+线上支付）
-                cmReturnedPurchase.setRefundOnlineBalanceFee(refundOnlineBalanceFee);
+                cmReturnedPurchase.setRefundOnlineBalanceFee(refundFee - userMoney);
             }
             //统计填写的拆分金额
             Double refundBanlace = null == cmReturnedPurchase.getRefundBalanceFee() ? 0 : cmReturnedPurchase.getRefundBalanceFee();

src/main/java/com/caimei/modules/order/dao/CmDiscernReceiptDao.java

@@ -106,7 +106,5 @@ public interface CmDiscernReceiptDao extends CrudDao<CmDiscernReceipt> {
 
     Double findRefundUserMoney(String orderID);
 
-    Double findOnlinePay(Integer orderID);
-
     ReceipCouponInfoVo getCouponInfo(String receiptID);
 }

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -546,7 +546,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
             //returnway=1,退线下余额>0或退线上余额>0  是定金订单？？？
             Double refundBalance = null == returnedPurchase.getRefundBalanceFee() ? 0 : returnedPurchase.getRefundBalanceFee();
             Double refundOnlineBalance = null == returnedPurchase.getRefundOnlineBalanceFee() ? 0 : returnedPurchase.getRefundOnlineBalanceFee();
-            if ((returnedPurchase.getReturnedWay().equals("1") && returnedPurchase.getRefundBalanceFee() > 0d) || null != newOrder.getRechargeGoods() || returnedPurchase.getRefundOnlineBalanceFee() > 0) {
+            if ((returnedPurchase.getReturnedWay().equals("1") && returnedPurchase.getRefundBalanceFee() > 0d) ||  null!=newOrder.getRechargeGoods() || returnedPurchase.getRefundOnlineBalanceFee() > 0) {
                 Double userMoney = user.getUserMoney();
                 Double ableUserMoney = user.getAbleUserMoney();
                 //退账户线下余额
@@ -555,9 +555,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 Double refundOnlineBalanceFee = returnedPurchase.getRefundOnlineBalanceFee();
                 Double refundFee = returnedPurchase.getRefundFee();
                 Double onlineMoney = user.getOnlineMoney();
-                userMoney = userMoney == null ? 0 : userMoney;
-                ableUserMoney = ableUserMoney == null ? 0 : ableUserMoney;
-                refundBalanceFee = refundBalanceFee == null ? 0 : refundBalanceFee;
+                if (userMoney == null) userMoney = 0d;
+                if (ableUserMoney == null) ableUserMoney = 0d;
+                if (refundBalanceFee == null) refundBalanceFee = 0d;
                 onlineMoney = onlineMoney == null ? 0 : onlineMoney;
                 refundOnlineBalanceFee = refundOnlineBalanceFee == null ? 0 : refundOnlineBalanceFee;
                 user.setUserID(newOrder.getUserID());
@@ -827,7 +827,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                         String msg = result.getString("msg");
                         logger.info("第三方退款失败>>>>>>>msg:" + msg);
                         throw new Exception("第三方退款失败！");
-                    } else {
+                    }else{
                         //存cm_online_refund
                         CmOnlineRefundVo cmOnlineRefundVo = new CmOnlineRefundVo();
                         cmOnlineRefundVo.setUserId(userId);
@@ -844,7 +844,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                     //查当前单线上余额支付总金额
                     Double onlineMoneyPay = cmReceiptOrderRelationDao.findOnlineMoneyPay(orderId);
                     if (null != onlineMoneyPay && onlineMoneyPay >= 0.01) {
-                        logger.info("线上余额退现金==============orderId==>" + orderId);
+                        logger.info("线上余额退现金==============orderId==>"+orderId);
                         //根据userid查产生线上余额的唯一请求单号，发起退款请求
                         //用户名下未分帐的线上余额订单mborderid
                         List<String> mborderIds = cmReceiptOrderRelationDao.findMborderId(userId);
@@ -880,7 +880,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                                         String msg = result.getString("msg");
                                         logger.info("余额退现失败>>>>>>>msg:" + msg);
                                         throw new Exception("第三方退款失败！");
-                                    } else {
+                                    }else{
                                         //存cm_online_refund
                                         CmOnlineRefundVo cmOnlineRefundVo = new CmOnlineRefundVo();
                                         cmOnlineRefundVo.setUserId(userId);
@@ -894,12 +894,12 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                                     //应付减已退
                                     onlineMoneyPay = MathUtil.sub(onlineMoneyPay, money).doubleValue();
                                 }
-                                if (onlineMoneyPay <= 0) {
+                                if(onlineMoneyPay<=0){
                                     break;
                                 }
                             }
                         }
-                        if (onlineMoneyPay <= 0) {
+                        if(onlineMoneyPay<=0){
                             CmUser user = cmUserDao.get(userId.toString());
                             //线上余额退完，user表减余额，cubr表统计余额减少
                             CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
@@ -917,7 +917,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                             user.setAbleUserMoney(v);
                             cmUserDao.updateMoney(user);
                         }
-                        if (onlineMoneyPay > 0) {
+                        if(onlineMoneyPay>0){
                             logger.info("订单不足退线上余额，请检查订单");
                             throw new Exception("订单不足退线上余额，请检查订单！");
                         }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1171,19 +1171,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 newOrder.setOrderInvoice(orderInvoice);
             }
         }
-        //线上/下余额赋值
-        Double userMoney = cmDiscernReceiptDao.findUserMoney(id);
-        Double onlineMoney = cmDiscernReceiptDao.findOnlineMoney(id);
-        if(null==userMoney){
-            newOrder.setUserMoney(0d);
-        }else{
-            newOrder.setUserMoney(userMoney);
-        }
-        if(null == onlineMoney){
-            newOrder.setOnlineMoney(0d);
-        }else{
-            newOrder.setOnlineMoney(onlineMoney);
-        }
         return newOrder;
     }
 

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -993,17 +993,6 @@
           AND balanceType = 3
           AND delflag = 0
     </select>
-    <select id="findOnlinePay" resultType="java.lang.Double">
-        SELECT SUM(cdr.receiptAmount) FROM  cm_discern_receipt cdr
-        LEFT JOIN cm_receipt_order_relation cror ON cror.receiptID = cdr.id
-        WHERE cdr.receiptType = 1
-          AND cror.relationType = 2
-          AND cdr.receiptType = 1
-          AND cror.delFlag = 0
-          AND cdr.delFlag = 0
-          AND cdr.payway = 1
-          AND cror.orderID = #{orderID}
-    </select>
     <select id="getCouponInfo" resultType="com.caimei.modules.order.entity.ReceipCouponInfoVo">
         SELECT c.name as clubName,cc.touchPrice,cc.couponAmount,cror.mborderId,cc.couponType,cdr.confirmDate
         FROM cm_receipt_order_relation cror