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

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

@@ -339,11 +339,12 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		// 收费形式
 		List<MusicGroupPaymentCalender> calenders = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
 
-		if (calenders == null || calenders.size() == 0) {
-			params.put("paymentcalender", "一次性");
+		/*if (calenders == null || calenders.size() == 0) {
+			
 		} else {
 			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")) + "月");
-		}
+		}*/
+		params.put("paymentcalender", "一次性");
 
 		params.put("isShowVisualSeal", false);
 
@@ -443,11 +444,13 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		// 收费形式
 		List<MusicGroupPaymentCalender> calenders = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
 
-		if (calenders == null || calenders.size() == 0) {
+		/*if (calenders == null || calenders.size() == 0) {
 			params.put("paymentcalender", "一次性");
 		} else {
 			params.put("paymentcalender", calenders.stream().map(cal -> cal.getPaymentMonth().toString()).collect(Collectors.joining("月,")) + "月");
-		}
+		}*/
+		
+		params.put("paymentcalender", "一次性");
 
 		params.put("isShowVisualSeal", true);
 

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);
@@ -122,9 +122,9 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 i++;
 
                 Map<String, BigDecimal> CostMap = new HashMap<>();
-                CostMap.put("sellCost",goods.getDiscountPrice());
-                if(goods.getAgreeCostPrice() != null){
-                    CostMap.put("SellCost2",goods.getAgreeCostPrice());
+                CostMap.put("sellCost", goods.getDiscountPrice());
+                if (goods.getAgreeCostPrice() != null) {
+                    CostMap.put("SellCost2", goods.getAgreeCostPrice());
                 }
 
                 SellOrder sellOrder = new SellOrder();
@@ -133,6 +133,8 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 sellOrder.setTransNo(studentPaymentRouteOrderDto.getTransNo());
                 sellOrder.setOrderId(studentPaymentRouteOrderDto.getId());
                 sellOrder.setOrderNo(orderNo);
+                sellOrder.setGoodsId(goods.getId());
+                sellOrder.setGoodsName(goods.getName());
                 sellOrder.setActualAmount(actualAmount);
                 sellOrder.setBalanceAmount(BigDecimal.ZERO);
                 sellOrder.setExpectAmount(actualAmount);
@@ -145,13 +147,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 sellOrder.setSellTime(studentPaymentRouteOrderDto.getCreateTime());
                 sellOrder.setCreateIme(new Date());
                 sellOrder.setUpdateTime(new Date());
-                if (goods.getType().equals(GoodsType.INSTRUMENT)) {
-                    sellOrder.setType(SellTypeEnum.INSTRUMENT);
-                } else if (goods.getType().equals(GoodsType.ACCESSORIES)) {
-                    sellOrder.setType(SellTypeEnum.ACCESSORIES);
-                } else {
-                    sellOrder.setType(SellTypeEnum.OTHER);
-                }
+                sellOrder.setType(SellTypeEnum.SCHOOL_BUY);
                 sellOrders.add(sellOrder);
             }
             sellOrderDao.batchInsert(sellOrders);