Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentPaymentOrderDto.java

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 
+import java.math.BigDecimal;
+
 public class StudentPaymentOrderDto extends StudentPaymentOrder {
 
     private String image;
@@ -12,6 +14,16 @@ public class StudentPaymentOrderDto extends StudentPaymentOrder {
 
     private Integer autoAffirmReceiveTime;
 
+    private BigDecimal goodsAmount = BigDecimal.ZERO;
+
+    public BigDecimal getGoodsAmount() {
+        return goodsAmount;
+    }
+
+    public void setGoodsAmount(BigDecimal goodsAmount) {
+        this.goodsAmount = goodsAmount;
+    }
+
     public Integer getAutoAffirmReceiveTime() {
         return autoAffirmReceiveTime;
     }

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

@@ -211,24 +211,24 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                     complementPrice = complementGoodies.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
                 }
 
-                BigDecimal hasRouteSellOrderActualAmount = BigDecimal.ZERO;
+                BigDecimal hasRouteSellOrderExpectAmount = BigDecimal.ZERO;
                 BigDecimal hasRouteSellOrderBalance = BigDecimal.ZERO;
                 for (SellOrder sellOrder : sellOrderList) {
                     if (!goods.getId().equals(sellOrder.getParentGoodsId()) && !goods.getId().equals(sellOrder.getParentGoodsId())) {
                         continue;
                     }
-                    BigDecimal sellOrderActualAmount = BigDecimal.ZERO;
+                    BigDecimal sellOrderExpectAmount = BigDecimal.ZERO;
                     BigDecimal sellOrderBalance = BigDecimal.ZERO;
                     if (complementPrice.compareTo(BigDecimal.ZERO) > 0) {
-                        sellOrderActualAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(expectAmount).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
+                        sellOrderExpectAmount = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(expectAmount).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                         sellOrderBalance = complementGoodsPrice.get(sellOrder.getGoodsId()).multiply(new BigDecimal(sellOrder.getNum())).multiply(balance).divide(complementPrice, 2, BigDecimal.ROUND_HALF_UP);
                     }
                      complementGoodsNum = complementGoodsNum - sellOrder.getNum();
                     if (complementGoodsNum <= 0) {
-                        sellOrderActualAmount = expectAmount.subtract(hasRouteSellOrderActualAmount);
-                        sellOrderBalance = balance.subtract(hasRouteSellOrderActualAmount);
+                        sellOrderExpectAmount = expectAmount.subtract(hasRouteSellOrderExpectAmount);
+                        sellOrderBalance = balance.subtract(hasRouteSellOrderBalance);
                     }
-                    hasRouteSellOrderActualAmount = hasRouteSellOrderActualAmount.add(sellOrderActualAmount);
+                    hasRouteSellOrderExpectAmount = hasRouteSellOrderExpectAmount.add(sellOrderExpectAmount);
                     hasRouteSellOrderBalance = hasRouteSellOrderBalance.add(sellOrderBalance);
 
                     sellOrder.setOrganId(studentPaymentOrder.getOrganId());
@@ -239,14 +239,13 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                         sellOrder.setEduTeacherId(musicGroup.getEducationalTeacherId());
                     }
                     sellOrder.setOrderNo(studentPaymentOrder.getOrderNo());
-                    sellOrder.setActualAmount(sellOrderActualAmount.subtract(sellOrderBalance));
+                    sellOrder.setActualAmount(sellOrderExpectAmount.subtract(sellOrderBalance));
                     sellOrder.setBalanceAmount(sellOrderBalance);
-                    sellOrder.setExpectAmount(sellOrderActualAmount);
+                    sellOrder.setExpectAmount(sellOrderExpectAmount);
                     sellOrder.setNum(1);
                     sellOrder.setUserId(studentPaymentOrder.getUserId());
                     sellOrder.setPaymentChannel(studentPaymentOrder.getPaymentChannel());
                     sellOrder.setMerNo(studentPaymentOrder.getMerNos());
-                    sellOrder.setAccountType(accountType);
                     sellOrder.setSellTime(studentPaymentOrder.getCreateTime());
                     sellOrder.setCreateIme(new Date());
                     sellOrder.setUpdateTime(new Date());

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

@@ -151,6 +151,7 @@
 		<result column="goods_image_" property="image" />
 		<result column="goods_name_" property="goodsName" />
 		<result column="goods_num_" property="goodsNum" />
+		<result column="goods_amount_" property="goodsAmount" />
 	</resultMap>
 	<sql id="queryStudentPaymentOrdersSql">
 		<where>
@@ -166,12 +167,13 @@
 		</where>
 	</sql>
     <select id="queryStudentPaymentOrders" resultMap="StudentPaymentOrderDto">
-		SELECT spo.*,g.image_ goods_image_,g.name_ goods_name_,so.num_ goods_num_
+		SELECT spo.*,g.image_ goods_image_,g.name_ goods_name_,so.num_ goods_num_,so.expect_amount_ goods_amount_
 		FROM student_payment_order spo
 		LEFT JOIN sell_order so ON so.order_no_ = spo.order_no_
 		LEFT JOIN goods g ON g.id_ = so.goods_id_
 		<include refid="queryStudentPaymentOrdersSql"/>
 		ORDER BY spo.pay_time_ DESC
+		<include refid="global.limit"/>
 	</select>
 	<select id="countStudentPaymentOrders" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT spo.id_)