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

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import com.ym.mec.common.dal.BaseDAO;
@@ -52,4 +53,10 @@ public interface StudentPaymentRouteOrderDao extends BaseDAO<Long, StudentPaymen
      * @return
      */
     Boolean deleteByOrderNo(@Param("orderNo") String orderNo);
+
+    /**
+     * 插入外部订单
+     * @return
+     */
+    int insertOrder(StudentPaymentOrder order);
 }

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

@@ -92,7 +92,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
         studentPaymentRouteOrderDto.setCreateTime(studentPaymentRouteOrderDto.getPayTime());
         studentPaymentRouteOrderDto.setUpdateTime(nowDate);
 
-        studentPaymentOrderDao.insert(studentPaymentRouteOrderDto);
+        studentPaymentRouteOrderDao.insertOrder(studentPaymentRouteOrderDto);
         StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();
         studentPaymentRouteOrder.setOrderNo(orderNo);
         studentPaymentRouteOrder.setMerNo(studentPaymentRouteOrderDto.getMerNo());
@@ -116,7 +116,10 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
             for (Map.Entry<Integer, Integer> goodsMap : studentPaymentRouteOrderDto.getGoodies().entrySet()) {
                 Goods goods = goodsDao.get(goodsMap.getKey());
 
-                BigDecimal actualAmount = studentPaymentRouteOrderDto.getGoodsAmount().multiply(goods.getGroupPurchasePrice().multiply(new BigDecimal(goodsMap.getValue()))).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
+                BigDecimal actualAmount = BigDecimal.ZERO;
+                if (goodsTotalPrice.compareTo(BigDecimal.ZERO) != 0) {
+                    actualAmount = studentPaymentRouteOrderDto.getGoodsAmount().multiply(goods.getGroupPurchasePrice().multiply(new BigDecimal(goodsMap.getValue()))).divide(goodsTotalPrice, 2, BigDecimal.ROUND_HALF_UP);
+                }
                 if (i == studentPaymentRouteOrderDto.getGoodies().size()) {
                     actualAmount = studentPaymentRouteOrderDto.getGoodsAmount().subtract(hasRouteAmount);
                 }

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

@@ -221,4 +221,24 @@
         where order_no_ = #{orderNo}
     </delete>
 
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insertOrder" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentOrder" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        INSERT INTO student_payment_order
+        (id_, group_type_, user_id_, organ_id_, routing_organ_id_, type_, expect_amount_, actual_amount_, com_amount_,
+        per_amount_,
+        balance_payment_amount_, remit_fee_, course_remit_fee_, trans_no_,
+        status_, memo_, create_time_, update_time_, payment_channel_, payment_business_channel_,
+        payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_, pay_time_)
+        VALUES (#{id}, #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{userId}, #{organId}, #{routingOrganId},
+        #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{expectAmount}, #{actualAmount}, #{comAmount}, #{perAmount}, #{balancePaymentAmount},
+        #{remitFee}, #{courseRemitFee}, #{transNo},
+        #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{memo}, #{createTime}, now(),
+        #{paymentChannel}, #{paymentBusinessChannel}, #{paymentAccountNo}, #{merNos}, #{orderNo},
+        #{musicGroupId},
+        #{classGroupId}, #{payTime})
+    </insert>
+
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/OperatingReportController.java

@@ -91,6 +91,10 @@ public class OperatingReportController extends BaseController {
                 }
             }
         }
+        if (queryInfo.getMonth() != null) {
+            queryInfo.setStartTime(DateUtil.getFirstDayOfMonth(queryInfo.getMonth()));
+            queryInfo.setEndTime(DateUtil.getLastDayOfMonth(queryInfo.getMonth()));
+        }
         queryInfo.setRows(65000);
         queryInfo.setType("organ");
         PageInfo<OperatingReport> pageList = operatingReportService.queryPage(queryInfo);
@@ -104,15 +108,15 @@ public class OperatingReportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
 
-            String[] header = {"分部", "销售收入（元）", "服务收入（元）", "业务退费（元）", "收入合计（元）", "销售成本（元）", "固定支出（元）", "变动支出（元）", "分摊费用（元）", "成本费用合计（元）", "利润（元）"};
-            String[] body = {"organName", "sellAmount", "serviceAmount", "refundAmount", "incomeTotal", "sellCost", "expensesAmount", "variableCost", "distributionAmount", "costAmount", "profit"};
+            String[] header = {"分部", "销售收入（元）", "服务收入（元）","其他收入（元）", "业务退费（元）", "收入合计（元）", "销售成本（元）", "固定支出（元）", "变动支出（元）", "分摊费用（元）", "成本费用合计（元）", "利润（元）"};
+            String[] body = {"organName", "sellAmount", "serviceAmount","otherIncome", "refundAmount", "incomeTotal", "sellCost", "expensesAmount", "variableCost", "distributionAmount", "costAmount", "profit"};
             HSSFWorkbook workbook = POIUtil.multipleSheetExportExcel(header, body, pageList.getRows(), null);
 
 
             queryInfo.setType("school");
             pageList = operatingReportService.queryPage(queryInfo);
-            String[] header2 = {"分部", "学校", "销售收入（元）", "服务收入（元）", "业务退费（元）", "收入合计（元）", "销售成本（元）", "固定支出（元）", "变动支出（元）", "分摊费用（元）", "成本费用合计（元）", "利润（元）"};
-            String[] body2 = {"organName", "schoolName", "sellAmount", "serviceAmount", "refundAmount", "incomeTotal", "sellCost", "expensesAmount", "variableCost", "distributionAmount", "costAmount", "profit"};
+            String[] header2 = {"分部", "学校", "销售收入（元）", "服务收入（元）","其他收入（元）", "业务退费（元）", "收入合计（元）", "销售成本（元）", "固定支出（元）", "变动支出（元）", "分摊费用（元）", "成本费用合计（元）", "利润（元）"};
+            String[] body2 = {"organName", "schoolName", "sellAmount", "serviceAmount","otherIncome", "refundAmount", "incomeTotal", "sellCost", "expensesAmount", "variableCost", "distributionAmount", "costAmount", "profit"};
             workbook = POIUtil.multipleSheetExportExcel(header2, body2, pageList.getRows(), workbook);
 
             response.setContentType("application/octet-stream");