Revert "线上/下余额退款"

This reverts commit 2374f425d02ee83fdf3a24ca48a45e019fa41778.

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

@@ -495,7 +495,7 @@ public class CmRefundsProductController extends BaseController {
                 }
                 cmReturnedPurchase.setRefundOnlineFee(refundOnlineFee);
                 cmReturnedPurchase.setRefundBalanceFee(newOrder.getBalancePayFee());
-            } else if ("1".equals(cmReturnedPurchase.getReturnedWay()) && cmReturnedPurchase.getRefundOnlineFee() == 0d) {
+            } else if ("1".equals(cmReturnedPurchase.getReturnedWay()) && cmReturnedPurchase.getRefundBalanceFee() == 0d) {
                 Double userMoney = cmDiscernReceiptDao.findUserMoney(newOrder.getOrderID().toString());
                 Double refundUserMoney = cmDiscernReceiptDao.findRefundUserMoney(newOrder.getOrderID().toString());
                 refundUserMoney = null == refundUserMoney ? 0 : refundUserMoney;

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

@@ -356,7 +356,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     onlineUseMoney = newOrder.getBalancePayFee();
                 } else {
                     userUseMoney = newOrder.getBalancePayFee() - onlineMoney;
-                    onlineUseMoney = onlineMoney;
                 }
 //                ableUserMoney = MathUtil.sub(ableUserMoney, MathUtil.add(onlineUseMoney, userUseMoney)).doubleValue();
 //                onlineMoney = MathUtil.sub(onlineMoney, onlineUseMoney).doubleValue();

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -707,20 +707,10 @@ public class NewOrderController extends BaseController {
             Double userUseMoney = 0d;
             //可用余额
             Double ableUserMoney = u.getAbleUserMoney();
-            if(ableUserMoney>order.getBalancePayFee()){
-                if (onlineMoney > order.getBalancePayFee()) {
-                    onlineUseMoney = order.getBalancePayFee();
-                } else {
-                    userUseMoney = order.getBalancePayFee() - onlineMoney;
-                    onlineUseMoney = onlineMoney;
-                }
-            }else{
-                if (onlineMoney >ableUserMoney){
-                    onlineUseMoney=ableUserMoney;
-                }else{
-                    userUseMoney=ableUserMoney-onlineMoney;
-                    onlineUseMoney=onlineMoney;
-                }
+            if (onlineMoney > u.getAbleUserMoney()) {
+                onlineUseMoney = u.getAbleUserMoney();
+            } else {
+                userUseMoney = u.getAbleUserMoney() - onlineMoney;
             }
             ableUserMoney = MathUtil.sub(ableUserMoney, MathUtil.add(onlineUseMoney, userUseMoney)).doubleValue();
             onlineMoney = MathUtil.sub(onlineMoney, onlineUseMoney).doubleValue();

src/main/resources/mappings/modules/user/CmUserMapper.xml

@@ -353,9 +353,6 @@
 		<if test="userMoney != null and userMoney != ''">
 			userMoney = #{userMoney},
 			</if>
-		<if test="onlineMoney != null">
-			onlineMoney = #{onlineMoney},
-		</if>
 		<if test="logoffTime != null and logoffTime != ''">
 			logoffTime = #{logoffTime},
 			</if>