Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentPaymentOrderQueryInfo.java

@@ -44,6 +44,12 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "余额支付金额",required = false)
     private BigDecimal balancePaymentAmount;
 
+    @ApiModelProperty(value = "现金支付金额(小于等于)",required = false)
+    private BigDecimal lessActualAmount;
+
+    @ApiModelProperty(value = "余额支付金额(小于等于)",required = false)
+    private BigDecimal lessBalancePaymentAmount;
+
     @ApiModelProperty(value = "订单号",required = false)
     private String orderNo;
 
@@ -192,4 +198,20 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     public void setUserIds(List<Integer> userIds) {
         this.userIds = userIds;
     }
+
+    public BigDecimal getLessActualAmount() {
+        return lessActualAmount;
+    }
+
+    public void setLessActualAmount(BigDecimal lessActualAmount) {
+        this.lessActualAmount = lessActualAmount;
+    }
+
+    public BigDecimal getLessBalancePaymentAmount() {
+        return lessBalancePaymentAmount;
+    }
+
+    public void setLessBalancePaymentAmount(BigDecimal lessBalancePaymentAmount) {
+        this.lessBalancePaymentAmount = lessBalancePaymentAmount;
+    }
 }

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

@@ -178,6 +178,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 sellOrder.setOrderId(studentPaymentOrder.getId());
                 if (musicGroup != null) {
                     sellOrder.setCooperationOrganId(musicGroup.getCooperationOrganId());
+                    sellOrder.setEduTeacherId(musicGroup.getEducationalTeacherId());
                 }
                 sellOrder.setOrderNo(studentPaymentOrder.getOrderNo());
                 sellOrder.setActualAmount(expectAmount.subtract(balance));

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

@@ -382,7 +382,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
             subjectChange.setStatus(SubjectChangeStatusEnum.SUCCESSED);
 
             //乐器辅件价差大于0时，有销售金额
-            if (studentPaymentOrder.getActualAmount().compareTo(BigDecimal.ZERO) > 0) {
+            if (subjectChange.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.GROUP) && studentPaymentOrder.getActualAmount().compareTo(BigDecimal.ZERO) > 0) {
                 BigDecimal sellAmount = studentPaymentOrder.getActualAmount().multiply(subjectChange.getGoodsMargin())
                         .divide(studentPaymentOrder.getExpectAmount(), 2, BigDecimal.ROUND_HALF_UP);
                 subjectChange.setSellAmount(sellAmount);

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

@@ -205,6 +205,7 @@
     </select>
 
     <sql id="queryPaymentOrder">
+        <![CDATA[
         <where>
             <if test="userIds != null">
                 AND spo.user_id_ IN
@@ -252,6 +253,12 @@
             <if test="balancePaymentAmount != null">
                 AND spo.balance_payment_amount_ >= #{balancePaymentAmount}
             </if>
+            <if test="lessActualAmount != null">
+                AND spo.actual_amount_ <= #{lessActualAmount}
+           </if>
+            <if test="lessBalancePaymentAmount != null">
+                AND spo.balance_payment_amount_ <= #{lessBalancePaymentAmount}
+            </if>
             <if test="orderNo != null">
                 AND spo.order_no_ = #{orderNo}
             </if>
@@ -266,6 +273,7 @@
                 AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
+         ]]>
     </sql>
 
     <select id="queryApplyGoodsList" resultMap="Goods" parameterType="map">

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

@@ -109,6 +109,7 @@
     </select>
 
     <sql id="queryPaymentOrder">
+        <![CDATA[
         <where>
             <if test="userIds != null">
                 AND spo.user_id_ IN
@@ -156,6 +157,12 @@
             <if test="balancePaymentAmount != null">
                 AND spo.balance_payment_amount_ >= #{balancePaymentAmount}
             </if>
+            <if test="lessActualAmount != null">
+                AND spo.actual_amount_ <= #{lessActualAmount}
+            </if>
+            <if test="lessBalancePaymentAmount != null">
+                AND spo.balance_payment_amount_ <= #{lessBalancePaymentAmount}
+            </if>
             <if test="orderNo != null">
                 AND spo.order_no_ = #{orderNo}
             </if>
@@ -170,6 +177,7 @@
                 AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
+        ]]>
     </sql>
     <select id="getRouteOrders" resultMap="StudentPaymentRouteOrder">
         SELECT *

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

@@ -73,7 +73,10 @@ public class SellOrderController extends BaseController {
     @PostMapping(value = "/update")
     @PreAuthorize("@pcs.hasPermissions('sellOrder/update')")
     public HttpResponseResult<SellOrder> update(SellOrder sellOrder) {
-        sellOrderService.update(sellOrder);
+        SellOrder oldSellOrder = sellOrderService.get(sellOrder.getId());
+        oldSellOrder.setEduTeacherId(sellOrder.getEduTeacherId());
+        oldSellOrder.setSellCost(sellOrder.getSellCost());
+        sellOrderService.update(oldSellOrder);
         return succeed(sellOrder);
     }