|  | @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 | 
	
		
			
				|  |  |  import com.alibaba.fastjson.JSONObject;
 | 
	
		
			
				|  |  |  import com.ym.mec.auth.api.client.SysUserFeignService;
 | 
	
		
			
				|  |  |  import com.ym.mec.auth.api.entity.SysUser;
 | 
	
		
			
				|  |  | +import com.ym.mec.biz.dal.dao.SellOrderDao;
 | 
	
		
			
				|  |  |  import com.ym.mec.biz.dal.dao.StudentDao;
 | 
	
		
			
				|  |  |  import com.ym.mec.biz.dal.dao.StudentRepairDao;
 | 
	
		
			
				|  |  |  import com.ym.mec.biz.dal.dao.SysConfigDao;
 | 
	
	
		
			
				|  | @@ -65,6 +66,8 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 | 
	
		
			
				|  |  |      private StudentPaymentRouteOrderService studentPaymentRouteOrderService;
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
		
			
				|  |  |      private SellOrderService sellOrderService;
 | 
	
		
			
				|  |  | +    @Autowired
 | 
	
		
			
				|  |  | +    private SellOrderDao sellOrderDao;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public BaseDAO<Integer, StudentRepair> getDAO() {
 | 
	
	
		
			
				|  | @@ -553,6 +556,82 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 | 
	
		
			
				|  |  |                  rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              sysUserCashAccountDetailService.insert(paymentDetail);
 | 
	
		
			
				|  |  | +            //销售订单详情
 | 
	
		
			
				|  |  | +            List<StudentPaymentOrderDetail> orderDetails = studentPaymentOrderDetailService.getOrderDetail(studentPaymentOrder.getId());
 | 
	
		
			
				|  |  | +            if (orderDetails.size() > 0) {
 | 
	
		
			
				|  |  | +                List<SellOrder> sellOrders = new ArrayList<>();
 | 
	
		
			
				|  |  | +                //总余额支付
 | 
	
		
			
				|  |  | +                BigDecimal totalBalance = studentPaymentOrder.getBalancePaymentAmount() != null ? studentPaymentOrder.getBalancePaymentAmount() : BigDecimal.ZERO;
 | 
	
		
			
				|  |  | +                //总价格
 | 
	
		
			
				|  |  | +                BigDecimal totalPrice = studentPaymentOrder.getExpectAmount();
 | 
	
		
			
				|  |  | +                //商品总付款
 | 
	
		
			
				|  |  | +                BigDecimal detailTotalPrice = orderDetails.stream().map(StudentPaymentOrderDetail::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
 | 
	
		
			
				|  |  | +                //商品销售占的余额
 | 
	
		
			
				|  |  | +                BigDecimal detailTotalBalance = detailTotalPrice.multiply(totalBalance).divide(totalPrice,2,BigDecimal.ROUND_HALF_UP);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                int i = 1;
 | 
	
		
			
				|  |  | +                BigDecimal detailRouteBalance = BigDecimal.ZERO;
 | 
	
		
			
				|  |  | +                for (StudentPaymentOrderDetail orderDetail : orderDetails) {
 | 
	
		
			
				|  |  | +                    BigDecimal detailBalance = orderDetail.getPrice().multiply(detailTotalBalance).divide(detailTotalPrice,2,BigDecimal.ROUND_HALF_UP);
 | 
	
		
			
				|  |  | +                    if(i == orderDetails.size()){
 | 
	
		
			
				|  |  | +                        detailBalance = detailTotalBalance.subtract(detailRouteBalance);
 | 
	
		
			
				|  |  | +                    }
 | 
	
		
			
				|  |  | +                    detailRouteBalance = detailRouteBalance.add(detailBalance);
 | 
	
		
			
				|  |  | +                    i++;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                    if (orderDetail.getType().equals(OrderDetailTypeEnum.MUSICAL) && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
 | 
	
		
			
				|  |  | +                        continue;
 | 
	
		
			
				|  |  | +                    }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                    BigDecimal goodsTotalPrice = orderDetail.getGoodsList().stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
 | 
	
		
			
				|  |  | +                    BigDecimal routePrice = BigDecimal.ZERO;
 | 
	
		
			
				|  |  | +                    BigDecimal routeBalance = BigDecimal.ZERO;
 | 
	
		
			
				|  |  | +                    int j = 1;
 | 
	
		
			
				|  |  | +                    for (Goods goods : orderDetail.getGoodsList()) {
 | 
	
		
			
				|  |  | +                        BigDecimal expectAmount = goods.getGroupPurchasePrice().multiply(orderDetail.getPrice()).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
 | 
	
		
			
				|  |  | +                        BigDecimal balance = goods.getGroupPurchasePrice().multiply(detailBalance).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
 | 
	
		
			
				|  |  | +                        if(j==orderDetail.getGoodsList().size()){
 | 
	
		
			
				|  |  | +                            expectAmount  = orderDetail.getPrice().subtract(routePrice);
 | 
	
		
			
				|  |  | +                            balance  = orderDetail.getPrice().subtract(routeBalance);
 | 
	
		
			
				|  |  | +                        }
 | 
	
		
			
				|  |  | +                        routePrice = routePrice.add(expectAmount);
 | 
	
		
			
				|  |  | +                        routeBalance = routeBalance.add(balance);
 | 
	
		
			
				|  |  | +                        j++;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                        SellOrder sellOrder = new SellOrder();
 | 
	
		
			
				|  |  | +                        Map<String, BigDecimal> CostMap = new HashMap<>();
 | 
	
		
			
				|  |  | +                        CostMap.put("sellCost",goods.getDiscountPrice());
 | 
	
		
			
				|  |  | +                        if(goods.getAgreeCostPrice() != null){
 | 
	
		
			
				|  |  | +                            CostMap.put("SellCost2",goods.getAgreeCostPrice());
 | 
	
		
			
				|  |  | +                        }
 | 
	
		
			
				|  |  | +                        sellOrder.setOrganId(studentPaymentOrder.getOrganId());
 | 
	
		
			
				|  |  | +                        sellOrder.setTransNo(studentPaymentOrder.getTransNo());
 | 
	
		
			
				|  |  | +                        sellOrder.setOrderId(studentPaymentOrder.getId());
 | 
	
		
			
				|  |  | +                        sellOrder.setOrderNo(studentPaymentOrder.getOrderNo());
 | 
	
		
			
				|  |  | +                        sellOrder.setActualAmount(expectAmount.subtract(balance));
 | 
	
		
			
				|  |  | +                        sellOrder.setBalanceAmount(balance);
 | 
	
		
			
				|  |  | +                        sellOrder.setExpectAmount(expectAmount);
 | 
	
		
			
				|  |  | +                        sellOrder.setSellCost(goods.getDiscountPrice());
 | 
	
		
			
				|  |  | +                        sellOrder.setSellCost2(JSON.toJSONString(CostMap));
 | 
	
		
			
				|  |  | +                        sellOrder.setNum(1);
 | 
	
		
			
				|  |  | +                        sellOrder.setUserId(studentPaymentOrder.getUserId());
 | 
	
		
			
				|  |  | +                        sellOrder.setPaymentChannel(studentPaymentOrder.getPaymentChannel());
 | 
	
		
			
				|  |  | +                        sellOrder.setMerNo(studentPaymentOrder.getMerNos());
 | 
	
		
			
				|  |  | +                        sellOrder.setSellTime(studentPaymentOrder.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);
 | 
	
		
			
				|  |  | +                        }
 | 
	
		
			
				|  |  | +                        sellOrders.add(sellOrder);
 | 
	
		
			
				|  |  | +                    }
 | 
	
		
			
				|  |  | +                }
 | 
	
		
			
				|  |  | +                sellOrderDao.batchInsert(sellOrders);
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  |          }else if(studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED){
 | 
	
		
			
				|  |  |              if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
 | 
	
		
			
				|  |  |                  sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "乐器维修支付失败");
 |