zouxuan 5 年之前
父節點
當前提交
bb1ae128e5

+ 14 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantPaymentOrder.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
@@ -39,6 +40,8 @@ public class TenantPaymentOrder {
 
 	/**  */
 	private Integer userId;
+	/**  */
+	private String username;
 
 	/** 分部id */
 	private Integer organId;
@@ -79,7 +82,7 @@ public class TenantPaymentOrder {
 	private String memo;
 
 	/** 付款渠道 */
-	private String paymentChannel;
+	private PaymentChannelEnum paymentChannel;
 
 	/** 业务渠道 */
 	private String paymentBusinessChannel;
@@ -102,6 +105,14 @@ public class TenantPaymentOrder {
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}
@@ -230,11 +241,11 @@ public class TenantPaymentOrder {
 		return this.memo;
 	}
 
-	public void setPaymentChannel(String paymentChannel) {
+	public void setPaymentChannel(PaymentChannelEnum paymentChannel) {
 		this.paymentChannel = paymentChannel;
 	}
 
-	public String getPaymentChannel() {
+	public PaymentChannelEnum getPaymentChannel() {
 		return this.paymentChannel;
 	}
 

+ 4 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PaymentChannelEnum.java

@@ -3,7 +3,10 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum PaymentChannelEnum implements BaseEnum<String, PaymentChannelEnum> {
-	YQPAY("YQPAY", "易乾"), UNIONPAY("UNIONPAY", "银联");
+	YQPAY("YQPAY", "双乾"),
+	ADAPAY("ADAPAY", "汇付"),
+	BALANCE("BALANCE", "余额"),
+	UNIONPAY("UNIONPAY", "银联");
 
 	private String code;
 

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantPaymentOrderServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -156,7 +157,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			tenantPaymentOrder.setComAmount(routingFee.get("COM"));
 			tenantPaymentOrder.setPerAmount(routingFee.get("PER"));
 			tenantPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
-			tenantPaymentOrder.setPaymentChannel((String) payMap.get("type"));
+			tenantPaymentOrder.setPaymentChannel(PaymentChannelEnum.valueOf(payMap.get("type").toString()));
 			tenantPaymentOrder.setUpdateTime(date);
 			tenantPaymentOrderDao.update(tenantPaymentOrder);
 

+ 4 - 2
mec-biz/src/main/resources/config/mybatis/TenantPaymentOrderMapper.xml

@@ -8,6 +8,7 @@
 		<result column="id_" property="id" />
 		<result column="activities_id_" property="activitiesId" />
 		<result column="user_id_" property="userId" />
+		<result column="real_name_" property="username" />
 		<result column="organ_id_" property="organId" />
 		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="trans_minutes_" property="transMinutes" />
@@ -21,7 +22,7 @@
 		<result column="trans_no_" property="transNo" />
 		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="memo_" property="memo" />
-		<result column="payment_channel_" property="paymentChannel" />
+		<result column="payment_channel_" property="paymentChannel" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="payment_business_channel_" property="paymentBusinessChannel" />
 		<result column="mer_nos_" property="merNos" />
 		<result column="order_no_" property="orderNo" />
@@ -165,7 +166,8 @@
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="TenantPaymentOrder"
 		parameterType="map">
-		SELECT tpo.* FROM tenant_payment_order tpo
+		SELECT tpo.*,su.real_name_ FROM tenant_payment_order tpo
+		LEFT JOIN sys_user su ON su.id_ = tpo.user_id_
         <include refid="queryPaymentOrder"/>
 		ORDER BY tpo.id_
 		<include refid="global.limit" />

+ 30 - 28
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -22,7 +22,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -71,6 +70,36 @@ public class ExportController extends BaseController {
     private PracticeGroupDao practiceGroupDao;
     @Autowired
     private CourseReviewService courseReviewService;
+    @Autowired
+    private TenantPaymentOrderService tenantPaymentOrderService;
+
+    @ApiOperation(value = "导出对外订单列表")
+    @PostMapping("export/tenantPaymentOrder")
+    @PreAuthorize("@pcs.hasPermissions('export/tenantPaymentOrder')")
+    public void tenantPaymentOrder(HttpServletResponse response,TenantPaymentOrderQueryInfo queryInfo) {
+        queryInfo.setRows(49999);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        List<TenantPaymentOrder> paymentOrders = tenantPaymentOrderService.queryPage(queryInfo).getRows();
+//        if (paymentOrders.size() > 50000) {
+//            throw new BizException("数据集太大,不能导出.最大数据集不能超过50000");
+//        }
+        try {
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"交易流水号", "订单号", "订单日期", "交易类型", "应付金额",
+                    "实付金额", "用户姓名", "交易方式", "收款账户", "交易状态", "备注", "交易方式"}, new String[]{
+                    "transNo", "orderNo", "createTime", "type.desc", "expectAmount",
+                    "actualAmount", "username", "paymentChannel", "merNos", "status.msg", "memo", "paymentChannel.desc"}, paymentOrders);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
+            response.flushBuffer();
+            workbook.write(response.getOutputStream());
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
     @ApiOperation(value = "导出老师课酬")
     @PostMapping("export/teacherSalary")
@@ -312,33 +341,6 @@ public class ExportController extends BaseController {
             e.printStackTrace();
         }
     }
-/*
-
-    @ApiOperation(value = "导出学员是否有课")
-    @PostMapping("export/studentHasCourse")
-    @PreAuthorize("@pcs.hasPermissions('export/studentHasCourse')")
-    public void studentHasCourse(HttpServletResponse response,String organId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            throw new BizException("获取用户信息失败");
-        }
-        if(StringUtils.isEmpty(organId)){
-            Employee employee = employeeDao.get(sysUser.getId());
-            organId = employee.getOrganIdList();
-        }
-        List<StudentHasCourseDto> hasCourseDtos = studentManageService.queryHasCourseStudent(organId);
-        try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "姓名", "分部", "所在乐团", "乐团所属声部", "所在vip课","是否激活","是否预约陪练课","是否有陪练课"}, new String[]{
-                    "userId", "userName", "organName", "musicGroupName", "subjectName", "vipGroupName","isActive.msg","isMake.msg","hasPracticeCourse.msg"}, hasCourseDtos);
-            response.setContentType("application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
-            workbook.write(response.getOutputStream());
-            workbook.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }*/
 
 
     @ApiOperation(value = "导出乐器采购清单")