乐团调整逻辑修改

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeRegistration.java

@@ -22,6 +22,13 @@ public class DegreeRegistration {
 
 
     /**
+     * 订单流水号
+     */
+    @ApiModelProperty(value = "订单流水号",required = false)
+    private String transNo;
+
+
+    /**
      * 姓名
      */
     @ApiModelProperty(value = "名字",required = true)
@@ -294,4 +301,12 @@ public class DegreeRegistration {
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
 }

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

@@ -24,6 +24,12 @@ public class DegreeQueryInfo extends QueryInfo {
     private String orderNo;
 
     /**
+     * 订单流水号
+     */
+    @ApiModelProperty(value = "订单流水号",required = false)
+    private String transNo;
+
+    /**
      * 姓名
      */
     @ApiModelProperty(value = "名字", required = true)
@@ -290,4 +296,12 @@ public class DegreeQueryInfo extends QueryInfo {
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
     }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
 }

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

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -190,6 +191,8 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         if (degree == null || degree.getStatus().equals(2)) {
             return true;
         }
+        StudentPaymentOrder order = studentPaymentOrderService.findOrderByOrderNo(degree.getOrderNo());
+        degree.setTransNo(order.getTransNo());
         degree.setStatus(status);
         degree.setUpdateTime(new Date());
         if (degreeRegistrationDao.update(degree) <= 0) {

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

@@ -55,6 +55,9 @@
             <if test="orderNo != null">
                 AND order_no_ = #{orderNo}
             </if>
+            <if test="transNo != null">
+                AND trans_no_ = #{transNo}
+            </if>
             <if test="name != null">
                 AND name_ = #{name}
             </if>

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

@@ -245,13 +245,13 @@
                 AND spo.balance_payment_amount_ >= #{balancePaymentAmount}
             </if>
             <if test="orderNo != null">
-                AND spo.order_no_ >= #{orderNo}
+                AND spo.order_no_ = #{orderNo}
             </if>
             <if test="merNos != null">
-                AND spo.mer_nos_ >= #{merNos}
+                AND spo.mer_nos_ = #{merNos}
             </if>
             <if test="transNo != null">
-                AND spo.trans_no_ >= #{transNo}
+                AND spo.trans_no_ = #{transNo}
             </if>
             <if test="chargeType != null">
                 AND spo.group_type_='SPORADIC'