Merge branch 'feature-operating-report' of http://git.dayaedu.com/yonge/mec into feature-operating-report

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

@@ -69,7 +69,7 @@ public class Goods {
 
 	/** 协议成本价 */
 	@ApiModelProperty(value = "协议成本价",required = false)
-	private String agreeCostPrice;
+	private BigDecimal agreeCostPrice;
 
 	/** 页面简介 */
 	@ApiModelProperty(value = "页面简介",required = false)
@@ -118,11 +118,11 @@ public class Goods {
 	@ApiModelProperty(value = "商品类型", required = false)
 	private GoodsType type;
 
-	public String getAgreeCostPrice() {
+	public BigDecimal getAgreeCostPrice() {
 		return agreeCostPrice;
 	}
 
-	public void setAgreeCostPrice(String agreeCostPrice) {
+	public void setAgreeCostPrice(BigDecimal agreeCostPrice) {
 		this.agreeCostPrice = agreeCostPrice;
 	}
 

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.PageInfoOrder;
 import com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto;
@@ -120,7 +122,11 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 hasRouteAmount = hasRouteAmount.add(actualAmount);
                 i++;
 
-               // String agreeCostPrice = goods.getAgreeCostPrice() == null ? BigDecimal.ZERO : goods.getAgreeCostPrice();
+                Map<String, BigDecimal> CostMap = new HashMap<>();
+                CostMap.put("sellCost",goods.getDiscountPrice());
+                if(goods.getAgreeCostPrice() != null){
+                    CostMap.put("SellCost2",goods.getAgreeCostPrice());
+                }
 
                 SellOrder sellOrder = new SellOrder();
                 sellOrder.setOrganId(studentPaymentRouteOrderDto.getOrganId());
@@ -132,7 +138,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 sellOrder.setBalanceAmount(BigDecimal.ZERO);
                 sellOrder.setExpectAmount(actualAmount);
                 sellOrder.setSellCost(goods.getDiscountPrice().multiply(new BigDecimal(goodsMap.getValue())));
-                //sellOrder.setSellCost2(agreeCostPrice.multiply(new BigDecimal(goodsMap.getValue())));
+                sellOrder.setSellCost2(JSON.toJSONString(CostMap));
                 sellOrder.setNum(goodsMap.getValue());
                 sellOrder.setUserId(studentPaymentRouteOrderDto.getUserId());
                 sellOrder.setPaymentChannel(studentPaymentRouteOrderDto.getPaymentChannel());

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

@@ -917,6 +917,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                         BigDecimal actualAmount = goods.getGroupPurchasePrice().multiply(orderDetail.getPrice()).multiply(studentPaymentOrder.getActualAmount()).divide(goodsTotalPrice.multiply(totalPrice), 2, BigDecimal.ROUND_HALF_UP);
                         BigDecimal balance = goods.getGroupPurchasePrice().multiply(orderDetail.getPrice()).multiply(balancePaymentAmount).divide(goodsTotalPrice.multiply(totalPrice), 2, BigDecimal.ROUND_HALF_UP);
                         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.setSchoolId(musicGroup.getSchoolId());
                         sellOrder.setTransNo(studentPaymentOrder.getTransNo());
@@ -926,7 +931,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                         sellOrder.setBalanceAmount(balancePaymentAmount);
                         sellOrder.setExpectAmount(actualAmount.add(balance));
                         sellOrder.setSellCost(goods.getDiscountPrice());
-                        sellOrder.setSellCost2(goods.getAgreeCostPrice());
+                        sellOrder.setSellCost2(JSON.toJSONString(CostMap));
                         sellOrder.setNum(1);
                         sellOrder.setUserId(studentPaymentOrder.getUserId());
                         sellOrder.setPaymentChannel(studentPaymentOrder.getPaymentChannel());

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

@@ -186,4 +186,6 @@
     </sql>
 
     <select id="getSellOrder" resultMap="SellOrder">
+
+    </select>
 </mapper>