update 销售列表根据添加日期倒序排

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

@@ -141,7 +141,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 sellOrder.setActualAmount(actualAmount);
                 sellOrder.setBalanceAmount(BigDecimal.ZERO);
                 sellOrder.setExpectAmount(actualAmount);
-                sellOrder.setSellCost(goods.getDiscountPrice().multiply(new BigDecimal(goodsMap.getValue())));
+                sellOrder.setSellCost(goods.getDiscountPrice());
                 sellOrder.setSellCost2(JSON.toJSONString(CostMap));
                 sellOrder.setNum(goodsMap.getValue());
                 sellOrder.setUserId(studentPaymentRouteOrderDto.getUserId());

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

@@ -192,7 +192,7 @@
         SELECT spo.organ_id_,
                co.id_                 cooperation_organ_id_,
                SUM(so.actual_amount_) sell_amount_,
-               SUM(so.sell_cost_)     sell_cost_
+               SUM(so.sell_cost_*so.num_)     sell_cost_
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
                  LEFT JOIN music_group mg ON mg.id_ = spo.music_group_id_
@@ -245,7 +245,7 @@
         SELECT spo.organ_id_,
                co.id_                 cooperation_organ_id_,
                SUM(so.actual_amount_) sell_amount_,
-               SUM(so.sell_cost_)     sell_cost_
+               SUM(so.sell_cost_*so.num_) sell_cost_
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
                  LEFT JOIN cooperation_organ co ON co.id_ = spo.music_group_id_
@@ -310,7 +310,7 @@
             resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
         SELECT spo.organ_id_,
                SUM(so.actual_amount_) sell_amount_,
-               SUM(so.sell_cost_)     sell_cost_
+               SUM(so.sell_cost_*so.num_) sell_cost_
         FROM student_payment_order spo
                  LEFT JOIN sell_order so on so.order_id_ = spo.id_
         WHERE spo.status_ = 'SUCCESS'

mec-web/src/main/java/com/ym/mec/web/controller/SellOrderController.java

@@ -73,8 +73,6 @@ public class SellOrderController extends BaseController {
     @PostMapping(value = "/update")
     @PreAuthorize("@pcs.hasPermissions('sellOrder/update')")
     public HttpResponseResult<SellOrder> update(SellOrder sellOrder) {
-        SellOrder oldOrder = sellOrderService.get(sellOrder.getId());
-        sellOrder.setSellCost(sellOrder.getSellCost().multiply(new BigDecimal(oldOrder.getNum())));
         sellOrderService.update(sellOrder);
         return succeed(sellOrder);
     }