修改维修回调添加销售订单

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

@@ -34,6 +34,9 @@ public class StudentPaymentRouteOrderDto extends StudentPaymentOrder {
      */
     private String merNo;
 
+    @ApiModelProperty(value = "收入类型",required = true)
+    private Integer saleType;
+
     /**
      * 是否承担手续费
      */
@@ -97,4 +100,12 @@ public class StudentPaymentRouteOrderDto extends StudentPaymentOrder {
     public void setGoodies(Map<Integer, Integer> goodies) {
         this.goodies = goodies;
     }
+
+    public Integer getSaleType() {
+        return saleType;
+    }
+
+    public void setSaleType(Integer saleType) {
+        this.saleType = saleType;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/OrderTypeEnum.java

@@ -17,8 +17,11 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
 	LUCK("LUCK", "福袋活动"),
 	TENANT_RECHARGE("TENANT_RECHARGE","租户充值"),
 	GOODS_SELL("GOODS_SELL","商品销售"),
+	SCHOOL_BUY("SCHOOL_BUY", "学校采购"),
+	GROUP_COURSE_ADD("GROUP_COURSE_ADD", "乐团加课"),
 	REPAIR("REPAIR","乐器维修");
 
+
 	private String code;
 
 	private String msg;

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

@@ -81,7 +81,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
     public StudentPaymentRouteOrderDto addOutOrder(StudentPaymentRouteOrderDto studentPaymentRouteOrderDto) {
         Date nowDate = new Date();
         String orderNo = idGeneratorService.generatorId("payment") + "";
-
+        studentPaymentRouteOrderDto.setType(studentPaymentRouteOrderDto.getSaleType().equals(1) ? OrderTypeEnum.GROUP_COURSE_ADD : OrderTypeEnum.SCHOOL_BUY);
         studentPaymentRouteOrderDto.setMerNos(studentPaymentRouteOrderDto.getMerNo());
         studentPaymentRouteOrderDto.setOrderNo(orderNo);
         studentPaymentRouteOrderDto.setGroupType(GroupType.OUTORDER);