乐团调整逻辑修改

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

@@ -15,6 +15,13 @@ public class DegreeRegistration {
     private Integer sporadicId;
 
     /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号",required = false)
+    private String orderNo;
+
+
+    /**
      * 姓名
      */
     @ApiModelProperty(value = "名字",required = true)
@@ -279,4 +286,12 @@ public class DegreeRegistration {
     public void setStatusStr(String statusStr) {
         this.statusStr = statusStr;
     }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
 }

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

@@ -18,6 +18,12 @@ public class DegreeQueryInfo extends QueryInfo {
     private Integer sporadicId;
 
     /**
+     * 零星支付id
+     */
+    @ApiModelProperty(value = "订单编号", required = true)
+    private String orderNo;
+
+    /**
      * 姓名
      */
     @ApiModelProperty(value = "名字", required = true)
@@ -276,4 +282,12 @@ public class DegreeQueryInfo extends QueryInfo {
     public void setStatus(String status) {
         this.status = status;
     }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
 }

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

@@ -43,6 +43,14 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "余额支付金额",required = false)
     private BigDecimal balancePaymentAmount;
 
+    @ApiModelProperty(value = "订单号",required = false)
+    private String orderNo;
+
+    @ApiModelProperty(value = "商户号",required = false)
+    private String merNos;
+
+    @ApiModelProperty(value = "商户订单号",required = false)
+    private String transNo;
 
     private boolean isExport = false;
 
@@ -149,4 +157,28 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     public void setBalancePaymentAmount(BigDecimal balancePaymentAmount) {
         this.balancePaymentAmount = balancePaymentAmount;
     }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getMerNos() {
+        return merNos;
+    }
+
+    public void setMerNos(String merNos) {
+        this.merNos = merNos;
+    }
+
+    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

@@ -73,7 +73,10 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
 			throw new BizException("报考级别为“" + chargeInfo.getTitle() + "”且乐理级别是“免考”时,必须上传证书");
 		}
 
+        String orderNo = idGeneratorService.generatorId("payment") + "";
+
         degreeRegistration.setLevel(chargeInfo.getTitle());
+        degreeRegistration.setOrderNo(orderNo);
         BigDecimal theoryMoney = BigDecimal.ZERO;
         switch (degreeRegistration.getTheoryLevel()) {
             case "一级":
@@ -119,7 +122,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;
 
         Integer userId = degreeRegistration.getId();
-        String orderNo = idGeneratorService.generatorId("payment") + "";
         String channelType = "";
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
         studentPaymentOrder.setUserId(userId);

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

@@ -6,6 +6,7 @@
         <!--@Table degree_registration-->
         <id column="id_" jdbcType="INTEGER" property="id"/>
         <result column="sporadic_id_" jdbcType="INTEGER" property="sporadicId"/>
+        <result column="order_no_" jdbcType="VARCHAR" property="orderNo"/>
         <result column="name_" jdbcType="VARCHAR" property="name"/>
         <result column="gender_" jdbcType="VARCHAR" property="gender"/>
         <result column="idcard_" jdbcType="VARCHAR" property="idcard"/>
@@ -51,6 +52,9 @@
             <if test="search != null and search != ''">
                 AND (id_ = #{search} OR name_ LIKE CONCAT('%',#{search},'%') )
             </if>
+            <if test="orderNo != null">
+                AND order_no_ = #{orderNo}
+            </if>
             <if test="name != null">
                 AND name_ = #{name}
             </if>

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

@@ -244,6 +244,15 @@
             <if test="balancePaymentAmount != null">
                 AND spo.balance_payment_amount_ >= #{balancePaymentAmount}
             </if>
+            <if test="orderNo != null">
+                AND spo.order_no_ >= #{orderNo}
+            </if>
+            <if test="merNos != null">
+                AND spo.mer_nos_ >= #{merNos}
+            </if>
+            <if test="transNo != null">
+                AND spo.trans_no_ >= #{transNo}
+            </if>
             <if test="chargeType != null">
                 AND spo.group_type_='SPORADIC'
                 AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}