商城财务导出

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

@@ -2503,10 +2503,6 @@ public class ExportServiceImpl implements ExportService {
         for (StudentPaymentOrderMallExportDto basicOrder : studentPaymentOrderExportDtos) {
             basicOrder.getUser().setUsername(studentNameMap.get(basicOrder.getUserId()));
             basicOrder.setUserOrganName(userOrganNameMap.get(basicOrder.getOrganId()));
-            //计算手续费
-            this.calcPlatformFee(basicOrder, serviceChargeMap, orderCountMap, tenantConfig, feeFlagMap);
-            //解析json
-            this.parseGoodsJson(basicOrder,categoryNames,productCategoryMap);
             String paymentChannel = "";
             if (basicOrder.getPaymentChannel() == null) {
             } else if (basicOrder.getPaymentChannel().equals("YQPAY")) {
@@ -2520,6 +2516,10 @@ public class ExportServiceImpl implements ExportService {
             if (basicOrder.getRouteAmount().compareTo(BigDecimal.ZERO) == 0) {
                 continue;
             }
+            //计算手续费
+            this.calcPlatformFee(basicOrder, serviceChargeMap, orderCountMap, tenantConfig, feeFlagMap);
+            //解析json
+            this.parseGoodsJson(basicOrder,categoryNames,productCategoryMap);
         }
         Map<String, String> headMap = getExportMap(new ExportDto(ExportEnum.MALL_ROUTE_ORDER_LIST));
         for (int j = 0; j < categoryNames.size(); j++) {

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

@@ -322,9 +322,10 @@ calender_id_,create_time_,create_by_,update_time_,update_by_,tenant_id_,type_
         spro.fee_flag_ feeFlag,
         sci.charge_type_,
         spo.expect_amount_ + spo.coupon_remit_fee_ orderAmount,
-        o.name_ organ_name
+        o.name_ organ_name,sgs.goods_json_
         FROM student_payment_route_order spro
         LEFT JOIN student_payment_order spo ON spo.order_no_ = spro.order_no_
+        left join student_goods_sell sgs ON sgs.order_no_ = spo.order_no_
         LEFT JOIN sporadic_charge_info sci ON spo.music_group_id_ = sci.id_
         LEFT JOIN organization o on spro.route_organ_id_ = o.id_
         <include refid="queryPaymentOrder"/>