Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -297,7 +297,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
             sellOrderDao.update(sellOrder);
 
             //2、金额退到余额
-            if (sellOrder.getActualAmount().compareTo(BigDecimal.ZERO) > 0) {
+            if (sellOrder.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
                 sysUserCashAccountService.updateBalance(sellOrder.getUserId(), sellOrder.getActualAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "订单：" + sellOrder.getOrderId() + " 商品id：" + sellOrder.getGoodsId() + "退货");
             }
         }

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -515,7 +515,6 @@
     <select id="getRefundIncome" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT organ_id_,
                cooperation_organ_id_,
-               -SUM(actual_amount_)    income_total_,
                -SUM(actual_amount_)    sell_amount_,
                -SUM(sell_cost_ * num_) sell_cost_,
                 SUM(actual_amount_)    other_income_