驾校订单字段修改

twzd-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java

@@ -4,15 +4,15 @@ import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysRole;
 import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.vo.AgentVO;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.system.service.ISysRoleService;
 import com.miaxis.system.service.ISysUserService;
-import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
 import com.miaxis.wx.service.IRefundRecordService;
 import com.miaxis.wx.service.IWxOrderService;
-import com.miaxis.common.core.domain.vo.AgentVO;
+import com.miaxis.wx.vo.WxSchoolOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -79,11 +79,11 @@ class PcWxController extends BaseController {
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
     //@PreAuthorize("@ss.hasPermi('wx:order:list')")
-    public ResponsePageInfo<WxOrder> schoolList(@ModelAttribute QuerySchoolOrderListDTO dto){
+    public ResponsePageInfo<WxSchoolOrder> schoolList(@ModelAttribute QuerySchoolOrderListDTO dto){
         startPage();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         dto.setSchoolName(user.getUserId()==1l? dto.getSchoolName(): user.getNickName());
-        List<WxOrder> list = wxOrderService.QuerySchoolOrderList(dto);
+        List<WxSchoolOrder> list = wxOrderService.QuerySchoolOrderList(dto);
         return toResponsePageInfo(list);
     }
 

twzd-service/src/main/java/com/miaxis/wx/domain/WxOrder.java

@@ -13,7 +13,6 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 电影订单对象 film_order
  *
  * @author miaxis
  * @date 2021-05-07

twzd-service/src/main/java/com/miaxis/wx/mapper/WxOrderMapper.java

@@ -5,6 +5,7 @@ import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.PcWxOrderListDTO;
 import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
 import com.miaxis.wx.dto.WxOrderListDTO;
+import com.miaxis.wx.vo.WxSchoolOrder;
 
 import java.util.List;
 
@@ -29,5 +30,5 @@ public interface WxOrderMapper extends BaseMapper<WxOrder> {
 
     List<WxOrder> selectPcOrderList(PcWxOrderListDTO pcWxOrderListDTO);
 
-    List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
+    List<WxSchoolOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
 }

twzd-service/src/main/java/com/miaxis/wx/service/IWxOrderService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
 import com.miaxis.wx.dto.WxExtractBankDTO;
+import com.miaxis.wx.vo.WxSchoolOrder;
 
 import java.util.List;
 
@@ -19,7 +20,7 @@ public interface IWxOrderService extends IService<WxOrder>{
     WxOrder getByOutTradeNo(String outTradeNo);
 
 
-    List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
+    List<WxSchoolOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
 
     String wxwithdrawal(Integer amount) throws Exception;
 

twzd-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -20,7 +20,6 @@ import com.miaxis.extension.service.IWxExtensionIncomeService;
 import com.miaxis.feign.dto.WxGzhMini;
 import com.miaxis.feign.dto.WxMessageTemplate;
 import com.miaxis.feign.service.IWxSendService;
-import com.miaxis.framework.web.service.TokenService;
 import com.miaxis.system.service.ISysConfigService;
 import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.wx.domain.WxExtract;
@@ -33,6 +32,7 @@ import com.miaxis.wx.service.IWxExtractBankService;
 import com.miaxis.wx.service.IWxExtractService;
 import com.miaxis.wx.service.IWxGzhService;
 import com.miaxis.wx.service.IWxOrderService;
+import com.miaxis.wx.vo.WxSchoolOrder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.joda.time.DateTime;
@@ -115,7 +115,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     }
 
     @Override
-    public List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto) {
+    public List<WxSchoolOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto) {
         return wxOrderMapper.QuerySchoolOrderList(dto);
     }
 

twzd-service/src/main/java/com/miaxis/wx/vo/WxSchoolOrder.java

@@ -0,0 +1,75 @@
+package com.miaxis.wx.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * @author miaxis
+ * @date 2021-05-07
+ */
+@Data
+@TableName("wx_order")
+@ApiModel(value = "WxOrder", description = "微信订单对象 wx_order")
+public class WxSchoolOrder  {
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /** app头像地址 */
+    @TableField("head_image")
+    @ApiModelProperty(value = "app头像地址")
+    private String headImage;
+
+    /** app昵称 */
+    @TableField("nick_name")
+    @ApiModelProperty(value = "app昵称")
+    private String nickName;
+
+
+    /** 商户订单号 */
+    @Excel(name = "商户订单号")
+    @TableField("out_trade_no")
+    @ApiModelProperty(value = "商户订单号")
+    private String outTradeNo;
+
+
+
+    /** 支付完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField("success_time")
+    @ApiModelProperty(value = "支付完成时间")
+    private Date successTime;
+
+
+    /** 订单总金额，单位为分。 */
+    @Excel(name = "订单总金额，单位为分。")
+    @TableField("total")
+    @ApiModelProperty(value = "订单总金额，单位为分。")
+    private Integer total;
+
+
+
+
+
+
+
+
+
+
+
+
+}

twzd-service/src/main/resources/mapper/wx/WxOrderMapper.xml

@@ -112,19 +112,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
 
-    <select id="QuerySchoolOrderList" resultType="com.miaxis.wx.domain.WxOrder">
-        select * from wx_order
+    <select id="QuerySchoolOrderList" resultType="com.miaxis.wx.vo.WxSchoolOrder">
+        select t2.nick_name,t1.id,t1.out_trade_no,t1.success_time,t1.total,t2.head_image from wx_order t1 left join user_info t2 on (t1.openid =t2.openid)
         where trade_state ='SUCCESS'
         <if test="schoolName != null  and schoolName != ''">
-            and  openid in (select openid from user_info where school_name = #{schoolName})
+            and  t1.openid in (select openid from user_info where school_name = #{schoolName})
         </if>
         <if test="startTime != null">
-            and DATE_FORMAT(create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+            and DATE_FORMAT(t1.create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null">
-            and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+            and DATE_FORMAT(t1.create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
         </if>
-        order by create_time desc
+        order by t1.create_time desc
     </select>
 
 </mapper>