Merge branch 'zx-2023-04-13' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -55,10 +55,10 @@ public class SellOrder{
     private BigDecimal balanceAmount = BigDecimal.ZERO;
 
     @ApiModelProperty(value="总部销售成本")
-    private BigDecimal sellCost;
+    private BigDecimal sellCost = BigDecimal.ZERO;
 
     @ApiModelProperty(value="分部销售成本")
-    private BigDecimal organSellCost;
+    private BigDecimal organSellCost = BigDecimal.ZERO;
 
     @ApiModelProperty(value="销售成本2")
     private String sellCost2;

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

@@ -7,6 +7,8 @@ public enum SellTypeEnum implements BaseEnum<String, SellTypeEnum> {
 	INSTRUMENT("INSTRUMENT", "乐器销售"),
 	ACCESSORIES("ACCESSORIES", "配件销售"),
 	SCHOOL_BUY("SCHOOL_BUY", "学校采购"),
+	TEACHING("TEACHING", "教材销售"),
+	STAFF("STAFF", "曲谱销售"),
 	OTHER("OTHER", "书籍（其他）");
 
 	private String code;

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

@@ -1354,7 +1354,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                                 GoodsOrderItemVO goodsVo = goodsOrderItemVOS.get(i);
                                 Goods goods = goodsSnMap.get(goodsVo.getProductSn());
                                 StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
-                                detail.setType(OrderDetailTypeEnum.valueOf(goods.getType().getCode()));
+                                detail.setType(OrderDetailTypeEnum.valueOf(goods.getType() == GoodsType.INSTRUMENT?"MUSICAL":goods.getType().getCode()));
                                 detail.setGoodsIdList(goods.getId().toString());
                                 detail.setPrice(goodsVo.getRealAmount());
                                 detail.setRemitFee(BigDecimal.ZERO);
@@ -1404,6 +1404,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                                     }
                                     sellOrder.setSellCost2(JSON.toJSONString(CostMap));
                                     sellOrder.setBatchNo(goodsProcurement.getBatchNo());
+                                    sellOrder.setOrganSellCost(goods.getOrganCostPrice());
                                 }
                                 sellOrder.setNum(goodsVo.getProductQuantity());
                                 sellOrder.setUserId(userId);
@@ -1413,6 +1414,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                                 sellOrder.setAccountType(accountType);
                                 sellOrder.setStatus(SellStatus.NORMAL);
                                 sellOrder.setSellTime(studentPaymentOrder.getPayTime());
+                                sellOrder.setGoodsId(goods.getId());
+                                sellOrder.setGoodsName(goods.getName());
+                                sellOrder.setType(SellTypeEnum.valueOf(goods.getType().getCode()));
                                 sellOrders.add(sellOrder);
                             }
                             sellOrderDao.batchInsert(sellOrders);