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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CooperationOrganDao.java

@@ -31,4 +31,10 @@ public interface CooperationOrganDao extends BaseDAO<Integer, CooperationOrgan>
 
 
     List<OrganFullJobResourceNumDto> getOrganFullJobResourceNum();
+
+    /**
+     * 获取全部使用中合作单位
+     * @return
+     */
+    List<CooperationOrgan> getAllCooperationOrgan();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SellOrderService.java

@@ -1,7 +1,10 @@
 package com.ym.mec.biz.service;
 
 
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.SellOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.common.service.BaseService;
 
 import java.math.BigDecimal;
@@ -19,4 +22,13 @@ public interface SellOrderService extends BaseService<Integer, SellOrder> {
      * @return
      */
     List<SellOrder> addSellOrder(Long orderId, String musicGroupId, List<Integer> goodsIds, BigDecimal totalAmount, BigDecimal balance);
+
+    /**
+     * 将订单详情加入销售列表
+     * @param orderDetails
+     * @param studentPaymentOrder
+     * @return
+     */
+    List<SellOrder> addOrderDetail2SellOrder(List<StudentPaymentOrderDetail> orderDetails, StudentPaymentOrder studentPaymentOrder, MusicGroup musicGroup);
+
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.OrganFullJobResourceNumDto;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.FinancialExpenditure;
 import com.ym.mec.biz.dal.entity.OperatingReport;
 import com.ym.mec.biz.dal.enums.ExpenditureTypeEnum;
@@ -55,6 +56,16 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
             operatingReport.setDistributionAmount(new BigDecimal(organFullJobResource.getNum()).multiply(fullJobFee).divide(new BigDecimal(12), 2, BigDecimal.ROUND_HALF_UP));
             organOperating.put(organFullJobResource.getOrganId(), operatingReport);
         }
+        //1、合作单位的全职资源分摊费用
+        List<CooperationOrgan> allCooperationOrgan = cooperationOrganDao.getAllCooperationOrgan();
+        for (CooperationOrgan cooperationOrgan : allCooperationOrgan) {
+            OperatingReport operatingReport = new OperatingReport();
+            operatingReport.setOrganId(cooperationOrgan.getOrganId());
+            operatingReport.setCooperationOrganId(cooperationOrgan.getId());
+            BigDecimal distributionAmount = cooperationOrgan.getFullJobResource().equals(1) ? fullJobFee.divide(new BigDecimal(12), 2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO;
+            operatingReport.setDistributionAmount(distributionAmount);
+            cooperationOperating.put(cooperationOrgan.getId(), operatingReport);
+        }
 
         //2、获取支出费用
         List<FinancialExpenditure> cooperationExpenditures = financialExpenditureDao.getCooperationExpenditure();
@@ -268,7 +279,6 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
             updateReport(operatingReport, params);
         });
         cooperationOperating.forEach((organId, operatingReport) -> {
-            operatingReport.setDistributionAmount(fullJobFee.divide(new BigDecimal(12), 2, BigDecimal.ROUND_HALF_UP));
             operatingReport.setMonth(startTime);
             operatingReport.setCreateTime(nowDate);
             updateReport(operatingReport, params);

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

@@ -8,6 +8,8 @@ import com.ym.mec.biz.dal.dao.SellOrderDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.GoodsType;
+import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.SellTypeEnum;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
@@ -120,4 +122,92 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
         sellOrderDao.batchInsert(sellOrders);
         return sellOrders;
     }
+
+    @Override
+    public List<SellOrder> addOrderDetail2SellOrder(List<StudentPaymentOrderDetail> orderDetails, StudentPaymentOrder studentPaymentOrder, MusicGroup musicGroup) {
+        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.compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO :
+                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().compareTo(BigDecimal.ZERO) <= 0 ? BigDecimal.ZERO :
+                    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 = BigDecimal.ZERO;
+                BigDecimal balance = BigDecimal.ZERO;
+                if (goodsTotalPrice.compareTo(BigDecimal.ZERO) > 0) {
+                    expectAmount = goods.getGroupPurchasePrice().multiply(orderDetail.getPrice()).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
+                    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());
+                if (musicGroup != null) {
+                    sellOrder.setCooperationOrganId(musicGroup.getCooperationOrganId());
+                }
+                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);
+        return sellOrders;
+    }
+
 }

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

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -93,7 +92,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private RedisCache<String, Object> redisCache;
     @Autowired
-    private SellOrderDao sellOrderDao;
+    private SellOrderService sellOrderService;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -279,7 +278,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     @Transactional
-    public StudentPaymentOrder addOrder(StudentRegistration studentRegistration, BigDecimal amount, String orderNo, String paymentChannel, BigDecimal courseFee, List<MusicGroupSubjectGoodsGroup> goodsGroups, List<Goods> goodsList, List<Goods> otherGoodsList, List<CourseFormDto> courseForms,BigDecimal remitFee,BigDecimal courseRemitFee) throws Exception {
+    public StudentPaymentOrder addOrder(StudentRegistration studentRegistration, BigDecimal amount, String orderNo, String paymentChannel, BigDecimal courseFee, List<MusicGroupSubjectGoodsGroup> goodsGroups, List<Goods> goodsList, List<Goods> otherGoodsList, List<CourseFormDto> courseForms, BigDecimal remitFee, BigDecimal courseRemitFee) throws Exception {
         Date date = new Date();
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
         studentPaymentOrder.setUserId(studentRegistration.getUserId());
@@ -411,7 +410,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     @Transactional
-    public StudentPaymentOrder reAddOrder(Integer userId, BigDecimal amount, String orderNo, String paymentChannel, BigDecimal courseFee, List<MusicGroupSubjectGoodsGroup> goodsGroups, List<Goods> goodsList, List<Goods> otherGoodsList, String musicGroupId, StudentPaymentOrder oldOrder, List<CourseFormDto> courseForms,BigDecimal remitFee,BigDecimal courseRemitFee) {
+    public StudentPaymentOrder reAddOrder(Integer userId, BigDecimal amount, String orderNo, String paymentChannel, BigDecimal courseFee, List<MusicGroupSubjectGoodsGroup> goodsGroups, List<Goods> goodsList, List<Goods> otherGoodsList, String musicGroupId, StudentPaymentOrder oldOrder, List<CourseFormDto> courseForms, BigDecimal remitFee, BigDecimal courseRemitFee) {
         //关闭老订单
         oldOrder.setStatus(DealStatusEnum.CLOSE);
         studentPaymentOrderService.update(oldOrder);
@@ -899,79 +898,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             //销售订单详情
             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.setCooperationOrganId(musicGroup.getCooperationOrganId());
-                        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);
+                sellOrderService.addOrderDetail2SellOrder(orderDetails, studentPaymentOrder,musicGroup);
             }
 
             //三方乐团不发送缴费通知

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

@@ -554,78 +554,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
             //销售订单详情
             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);
+                sellOrderService.addOrderDetail2SellOrder(orderDetails, studentPaymentOrder, null);
             }
         } else if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
             if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {

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

@@ -145,4 +145,10 @@
         WHERE full_job_resource_ =1 AND is_enable_=1 AND del_flag_ = 0
         GROUP BY organ_id_
     </select>
+
+    <!-- 获取全部使用中的合作单位 -->
+    <select id="getAllCooperationOrgan" resultMap="CooperationOrgan">
+        SELECT * FROM cooperation_organ
+        WHERE full_job_resource_ =1 AND is_enable_=1 AND del_flag_ = 0
+    </select>
 </mapper>

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

@@ -173,7 +173,7 @@
     </select>
 
     <select id="getOrderDetail" resultMap="StudentPaymentOrderDetail">
-        SELECT spod.*,g.id_ goods_id_,g.name_ goods_name_,g.group_purchase_price_,g.discount_price_,g.agree_cost_price_,g.type_ good_type_ FROM student_payment_order_detail spod
+        SELECT spod.*,g.id_ goods_id_,g.name_ goods_name_,g.group_purchase_price_,g.discount_price_,g.agree_cost_price_,g.type_ goods_type_ FROM student_payment_order_detail spod
                           LEFT JOIN goods g ON FIND_IN_SET(g.id_,spod.goods_id_list_)
         WHERE spod.payment_order_id_ = #{orderId} AND spod.goods_id_list_ IS NOT NULL
     </select>