Merge remote-tracking branch 'origin/master'

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

@@ -15,6 +15,20 @@ public class DegreeRegistration {
     private Integer sporadicId;
 
     /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号",required = false)
+    private String orderNo;
+
+
+    /**
+     * 订单流水号
+     */
+    @ApiModelProperty(value = "订单流水号",required = false)
+    private String transNo;
+
+
+    /**
      * 姓名
      */
     @ApiModelProperty(value = "名字",required = true)
@@ -279,4 +293,20 @@ public class DegreeRegistration {
     public void setStatusStr(String statusStr) {
         this.statusStr = statusStr;
     }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    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

@@ -18,6 +18,18 @@ public class DegreeQueryInfo extends QueryInfo {
     private Integer sporadicId;
 
     /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号", required = true)
+    private String orderNo;
+
+    /**
+     * 订单流水号
+     */
+    @ApiModelProperty(value = "订单流水号",required = false)
+    private String transNo;
+
+    /**
      * 姓名
      */
     @ApiModelProperty(value = "名字", required = true)
@@ -276,4 +288,20 @@ 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;
+    }
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
 }

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/DegreeRegistrationService.java

@@ -13,7 +13,7 @@ public interface DegreeRegistrationService extends BaseService<Integer, DegreeRe
 
     Map pay(DegreeRegistration degreeRegistration) throws Exception;
 
-    Boolean updateStatus(Integer id , Integer status);
+    Boolean updateStatus(Integer id , Integer status,String orderNo);
 
     PageInfoDegree<DegreeRegistration> getPageList(DegreeQueryInfo queryInfo);
 }

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;
@@ -73,7 +74,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 +123,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);
@@ -183,11 +186,14 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
     }
 
     @Override
-    public Boolean updateStatus(Integer id, Integer status) {
+    public Boolean updateStatus(Integer id, Integer status,String orderNo) {
         DegreeRegistration degree = degreeRegistrationDao.getLock(id);
         if (degree == null || degree.getStatus().equals(2)) {
             return true;
         }
+        StudentPaymentOrder order = studentPaymentOrderService.findOrderByOrderNo(orderNo);
+        degree.setOrderNo(orderNo);
+        degree.setTransNo(order.getTransNo());
         degree.setStatus(status);
         degree.setUpdateTime(new Date());
         if (degreeRegistrationDao.update(degree) <= 0) {

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

@@ -80,7 +80,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             } else if (info.getChargeType().getCode() == 9) { //零星收费账户充值
                 sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getActualAmount(), PlatformCashAccountDetailTypeEnum.RECHARGE, "零星收费账户充值", studentPaymentOrder.getTransNo());
             } else if (info.getOrganId().equals(42) && info.getChargeType().equals(SporadicChargeTypeEnum.LEVEL)) {
-                degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(), 2);
+                degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(), 2,studentPaymentOrder.getOrderNo());
                 return true;
             } else {
                 //插入交易明细
@@ -131,7 +131,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         }
         if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
             if (info.getOrganId().equals(42) && info.getChargeType().equals(SporadicChargeTypeEnum.LEVEL)){
-                degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(),0);
+                degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(),0,studentPaymentOrder.getOrderNo());
                 return true;
             }
 

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

@@ -6,6 +6,8 @@
         <!--@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="trans_no_" jdbcType="VARCHAR" property="transNo"/>
         <result column="name_" jdbcType="VARCHAR" property="name"/>
         <result column="gender_" jdbcType="VARCHAR" property="gender"/>
         <result column="idcard_" jdbcType="VARCHAR" property="idcard"/>
@@ -40,7 +42,7 @@
     <sql id="queryPageSql">
         <where>
             <if test="status != null and status=='reg'">
-                <![CDATA[AND status_ <= 1]]>
+                AND <![CDATA[status_ <= 1]]>
             </if>
             <if test="status != null and status=='pay'">
                 AND status_ = 2
@@ -51,6 +53,12 @@
             <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="transNo != null">
+                AND trans_no_ = #{transNo}
+            </if>
             <if test="name != null">
                 AND name_ = #{name}
             </if>
@@ -109,12 +117,12 @@
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration"
             useGeneratedKeys="true">
         <!--@mbg.generated-->
-        insert into degree_registration (sporadic_id_, name_, gender_,
+        insert into degree_registration (sporadic_id_,order_no_, name_, gender_,
         idcard_, city_, school_,
         subject_,level_, theory_level_,theory_money_, theory_cert_,mobile_,
         money_, memo_, create_time_,
         update_time_, status_)
-        values (#{sporadicId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR},
+        values (#{sporadicId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR},
         #{idcard,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{school,jdbcType=VARCHAR},
         #{subject,jdbcType=VARCHAR},#{level,jdbcType=VARCHAR},
         #{theoryLevel,jdbcType=VARCHAR},#{theoryMoney,jdbcType=DECIMAL},
@@ -128,6 +136,12 @@
             <if test="sporadicId != null">
                 sporadic_id_ = #{sporadicId,jdbcType=INTEGER},
             </if>
+            <if test="orderNo != null">
+                order_no_ = #{orderNo,jdbcType=VARCHAR},
+            </if>
+            <if test="transNo != null">
+                trans_no_ = #{transNo,jdbcType=VARCHAR},
+            </if>
             <if test="name != null">
                 name_ = #{name,jdbcType=VARCHAR},
             </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}

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

@@ -1577,7 +1577,7 @@ public class ExportController extends BaseController {
         queryInfo.setRows(65000);
         PageInfoDegree<DegreeRegistration> pageList = degreeRegistrationService.getPageList(queryInfo);
         if (pageList.getTotal() <= 0) {
-            response.setStatus(500);
+            response.setStatus(200);
             response.setContentType("Content-Type: application/json;charset=UTF-8");
             response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
             response.flushBuffer();
@@ -1598,8 +1598,8 @@ public class ExportController extends BaseController {
 				}
             }
 
-            String[] header = {"姓名", "性别", "身份证号", "城市", "学校", "报考乐器", "报考级别", "乐理级别", "乐理级别证书", "家长联系电话", "考级费用", "乐理费用", "备注","缴费状态","报名时间"};
-            String[] body = {"name", "gender", "idcard", "city", "school", "subject", "level", "theoryLevel", "theoryCert", "mobile", "money", "theoryMoney", "memo","statusStr","createTime"};
+            String[] header = {"姓名", "性别", "身份证号", "城市", "学校", "报考乐器", "报考级别", "乐理级别", "乐理级别证书", "家长联系电话", "考级费用", "乐理费用", "备注","缴费状态","订单编号","商户订单号","报名时间"};
+            String[] body = {"name", "gender", "idcard", "city", "school", "subject", "level", "theoryLevel", "theoryCert", "mobile", "money", "theoryMoney", "memo","statusStr","orderNo","transNo","createTime"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");