Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jsjp-service/src/main/java/com/miaxis/order/service/IOrderInfoService.java
#	jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

jsjp-admin/src/main/java/com/miaxis/app/controller/order/OrderInfoController.java

@@ -2,13 +2,18 @@ package com.miaxis.app.controller.order;
 
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.service.IOrderInfoService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -25,6 +30,7 @@ public class OrderInfoController extends BaseController{
     @Autowired
     private IOrderInfoService orderInfoService;
 
+
     /**
      * 查询订单信息列表
      */
@@ -39,19 +45,13 @@ public class OrderInfoController extends BaseController{
         List<OrderInfo> list = orderInfoService.selectOrderInfoList(orderInfo);
         return toResponsePageInfo(list);
     }
-    
 
-    /**
-     * 获取订单信息详细信息
-     */
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取订单信息详细信息")
-    public Response<OrderInfo> getInfo(
-            @ApiParam(name = "id", value = "订单信息参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return Response.success(orderInfoService.getById(id));
-    }
+
+
+
+
+
+
 
 
 

jsjp-admin/src/main/java/com/miaxis/pc/PcOrderInfoController.java

@@ -0,0 +1,102 @@
+package com.miaxis.pc;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.dto.QuerySchoolOrderListDTO;
+import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.order.vo.QuerySchoolOrderListVo;
+import com.miaxis.wx.domain.WxJsOrder;
+import com.miaxis.wx.service.IRefundRecordService;
+import com.miaxis.wx.service.IWxJsOrderService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
+
+/**
+ * 【订单信息】Controller
+ *
+ * @author miaxis
+ * @date 2022-06-07
+ */
+@RestController
+@RequestMapping("/order/info")
+@Api(tags={"【PC-订单信息】"})
+public class PcOrderInfoController extends BaseController{
+    @Autowired
+    private IOrderInfoService orderInfoService;
+    @Autowired
+    private IWxJsOrderService wxJsOrderService;
+
+    @Autowired
+    private IRefundRecordService refundRecordService;
+
+    /**
+     * 查询订单信息列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询订单信息列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<OrderInfo> list(@ModelAttribute OrderInfo orderInfo){
+        startPage();
+        List<OrderInfo> list = orderInfoService.selectOrderInfoList(orderInfo);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 获取订单信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取订单信息详细信息")
+    public Response<OrderInfo> getInfo(
+            @ApiParam(name = "id", value = "订单信息参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(orderInfoService.getById(id));
+    }
+
+    /**
+     * 查询驾校订单
+     */
+    @GetMapping("/school/list")
+    @ApiOperation("查询驾校报表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<QuerySchoolOrderListVo> list(@ModelAttribute QuerySchoolOrderListDTO schoolOrderListDTO) {
+        startPage();
+        List<QuerySchoolOrderListVo> list = orderInfoService.selectSchoolOrderInfoList(schoolOrderListDTO);
+        return toResponsePageInfo(list);
+
+
+    }
+
+    /**
+     * 发起退款
+     */
+    @PutMapping(value = "/refund/{outTradeNo}")
+    @ApiOperation("发起退款")
+    public Response<OrderInfo> refund(
+            @ApiParam(name = "outTradeNo", value = "订单信息参数", required = true)
+            @PathVariable("outTradeNo") String outTradeNo
+    ) throws Exception {
+        String refundCode = getOrderCode(null);
+        WxJsOrder order = wxJsOrderService.getByOutTradeNo(outTradeNo);
+        refundRecordService.refund(order,refundCode,"极速驾培退款");
+        //todo 取消会员
+        return Response.success();
+    }
+
+
+
+}

jsjp-generator/src/main/java/com/miaxis/generator/util/GenUtils.java

@@ -11,7 +11,7 @@ import java.util.Arrays;
 
 /**
  * 代码生成器 工具类
- * 
+ *
  * @author miaxis
  */
 public class GenUtils
@@ -22,8 +22,8 @@ public class GenUtils
     public static void initTable(GenTable genTable, String operName)
     {
         genTable.setClassName(convertClassName(genTable.getTableName()));
-        genTable.setPackageName(GenConfig.getPackageName());
-        genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
+        genTable.setPackageName(GenConfig.getPackageName()+getModuleName(genTable.getTableName()));
+        genTable.setModuleName(getModuleName(genTable.getTableName()));
         genTable.setBusinessName(getBusinessName(genTable.getTableName()));
         genTable.setFunctionName(replaceText(genTable.getTableComment()));
         genTable.setFunctionAuthor(GenConfig.getAuthor());
@@ -121,7 +121,7 @@ public class GenUtils
 
     /**
      * 校验数组是否包含指定值
-     * 
+     *
      * @param arr 数组
      * @param targetValue 值
      * @return 是否包含
@@ -133,21 +133,18 @@ public class GenUtils
 
     /**
      * 获取模块名
-     * 
-     * @param packageName 包名
+     *
+     * @param tableName 包名
      * @return 模块名
      */
-    public static String getModuleName(String packageName)
+    public static String getModuleName(String tableName)
     {
-        int lastIndex = packageName.lastIndexOf(".");
-        int nameLength = packageName.length();
-        String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
-        return moduleName;
+        return tableName.split("_")[0];
     }
 
     /**
      * 获取业务名
-     * 
+     *
      * @param tableName 表名
      * @return 业务名
      */
@@ -161,7 +158,7 @@ public class GenUtils
 
     /**
      * 表名转换成Java类名
-     * 
+     *
      * @param tableName 表名称
      * @return 类名
      */
@@ -179,7 +176,7 @@ public class GenUtils
 
     /**
      * 批量替换前缀
-     * 
+     *
      * @param replacementm 替换值
      * @param searchList 替换列表
      * @return
@@ -200,7 +197,7 @@ public class GenUtils
 
     /**
      * 关键字替换
-     * 
+     *
      * @param text 需要被替换的名字
      * @return 替换后的名字
      */
@@ -211,7 +208,7 @@ public class GenUtils
 
     /**
      * 获取数据库类型字段
-     * 
+     *
      * @param columnType 列类型
      * @return 截取后的列类型
      */
@@ -229,7 +226,7 @@ public class GenUtils
 
     /**
      * 获取字段长度
-     * 
+     *
      * @param columnType 列类型
      * @return 截取后的列类型
      */

jsjp-generator/src/main/resources/generator.yml

@@ -3,7 +3,7 @@ gen:
   # 作者
   author: miaxis
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.miaxis.xxx
+  packageName: com.miaxis
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

jsjp-service/src/main/java/com/miaxis/order/dto/QuerySchoolOrderListDTO.java

@@ -0,0 +1,31 @@
+package com.miaxis.order.dto;
+
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+
+ */
+@Data
+@ApiModel(value = "QuerySchoolOrderListDTO", description = "驾校订单查询参数对象")
+public class QuerySchoolOrderListDTO extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "开始时间，格式yyyyMMdd")
+//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private String startTime;
+
+
+    @ApiModelProperty(value = "结束时间，格式yyyyMMdd")
+//    @JsonFormat(pattern="yyyyMMdd",timezone = "GMT+8")
+    private String endTime;
+
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
+
+
+}

jsjp-service/src/main/java/com/miaxis/order/mapper/OrderInfoMapper.java

@@ -1,8 +1,11 @@
 package com.miaxis.order.mapper;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.dto.QuerySchoolOrderListDTO;
+import com.miaxis.order.vo.QuerySchoolOrderListVo;
+
+import java.util.List;
 
 /**
  * 订单信息Mapper接口
@@ -20,4 +23,6 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
     public List<OrderInfo> selectOrderInfoList(OrderInfo orderInfo);
 
     OrderInfo getByOutTradeNo(String outTradeNo);
+
+    List<QuerySchoolOrderListVo> selectSchoolOrderInfoList(QuerySchoolOrderListDTO schoolOrderListDTO);
 }

jsjp-service/src/main/java/com/miaxis/order/service/IOrderInfoService.java

@@ -3,7 +3,6 @@ package com.miaxis.order.service;
 import java.util.List;
 import com.miaxis.order.domain.OrderInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.miaxis.wx.domain.WxJsOrder;
 
 /**
  * 订单信息Service接口
@@ -28,4 +27,7 @@ public interface IOrderInfoService extends IService<OrderInfo>{
 
    public void writeVipDataToDb(String goodsName,Long userId, String userName, String outTrandeNo,Integer total,Integer payType);
 
+
+
+    List<QuerySchoolOrderListVo> selectSchoolOrderInfoList(QuerySchoolOrderListDTO schoolOrderListDTO);
 }

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -7,17 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.miaxis.common.utils.DateUtils;
-import com.miaxis.newgzpt.domain.GzptSchActivation;
-import com.miaxis.newgzpt.domain.GzptSchPayConfig;
-import com.miaxis.newgzpt.domain.GzptSchPayLog;
-import com.miaxis.newgzpt.domain.GzptUserInfo;
-import com.miaxis.newgzpt.service.IGzptSchActivationService;
-import com.miaxis.newgzpt.service.IGzptSchPayConfigService;
-import com.miaxis.newgzpt.service.IGzptSchPayLogService;
-import com.miaxis.newgzpt.service.IGzptUserInfoService;
 import com.miaxis.userInfo.domain.UserVip;
 import com.miaxis.userInfo.service.IUserVipService;
-import com.miaxis.wx.domain.WxJsOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -109,9 +100,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             gzptSchPayLog.setCrtime(new Date());
 
 
-
-        } else if ("科一专项VIP".equals(orderInfo.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+        if ("科一专项VIP".equals(goodsName)) {
+            UserVip userVip = userVipService.getUserVipByUserId(userId);
             if (userVip != null) {
                 //修改会员信息
                 Date km1Date = userVip.getSubject1();
@@ -181,8 +171,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 userVipService.save(uv);
                 this.save(orderInfo);
             }
-        } else if ("科三专项VIP".equals(orderInfo.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+        } else if ("科三专项VIP".equals(goodsName)) {
+            UserVip userVip = userVipService.getUserVipByUserId(userId);
             if (userVip != null) {
                 //修改会员信息
                 Date km3Date = userVip.getSubject3();
@@ -244,8 +234,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             } else {
                 //新增会员信息
                 UserVip uv = new UserVip();
-                uv.setUserId(order.getUserId());
-                uv.setUserName(order.getUserName());
+                uv.setUserId(userId);
+                uv.setUserName(userName);
                 long x = now.getTime() + oneYearLong;
                 Date km4oneYear = new Date(x);
                 uv.setSubject4(km4oneYear);
@@ -253,231 +243,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 this.save(orderInfo);
             }
 
-        } else if ("科目一二三四所有付费权益".equals(orderInfo.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                Date km2Date = userVip.getSubject2();
-                Date km3Date = userVip.getSubject3();
-                Date km4Date = userVip.getSubject4();
-                if (km1Date != null) { //科目一处理
-                    long x = km1Date.getTime() + oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                }
-                if (km2Date != null) { //科目二处理
-                    long x = km2Date.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                if (km3Date != null) { //科目三处理
-                    long x = km3Date.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                if (km4Date != null) { //科目四处理
-                    long x = km4Date.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-                this.save(orderInfo);
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(order.getUserId());
-                uv.setUserName(order.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date oneYear = new Date(x);
-                uv.setSubject1(oneYear);
-                uv.setSubject2(oneYear);
-                uv.setSubject3(oneYear);
-                uv.setSubject4(oneYear);
-                userVipService.save(uv);
-                this.save(orderInfo);
-            }
-        } else if ("科一+科四VIP".equals(orderInfo.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                Date km4Date = userVip.getSubject4();
-                if (km1Date != null) { //科目一处理
-                    long x = km1Date.getTime() + oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                }
-                if (km4Date != null) { //科目四处理
-                    long x = km4Date.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-                this.save(orderInfo);
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(order.getUserId());
-                uv.setUserName(order.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date oneYear = new Date(x);
-                uv.setSubject1(oneYear);
-                uv.setSubject4(oneYear);
-                userVipService.save(uv);
-                this.save(orderInfo);
-            }
-        } else if ("科二+科三VIP".equals(orderInfo.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                Date km3Date = userVip.getSubject3();
-                if (km2Date != null) { //科目二处理
-                    long x = km2Date.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                if (km3Date != null) { //科目三处理
-                    long x = km3Date.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                userVipService.updateById(userVip);
-                this.save(orderInfo);
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(order.getUserId());
-                uv.setUserName(order.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date oneYear = new Date(x);
-                uv.setSubject2(oneYear);
-                uv.setSubject3(oneYear);
-                userVipService.save(uv);
-                this.save(orderInfo);
-            }
-        } else if ("科二+科三+科四".equals(orderInfo.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                Date km3Date = userVip.getSubject3();
-                Date km4Date = userVip.getSubject4();
-                if (km2Date != null) { //科目二处理
-                    long x = km2Date.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                if (km3Date != null) { //科目三处理
-                    long x = km3Date.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                if (km4Date != null) { //科目四处理
-                    long x = km4Date.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-                this.save(orderInfo);
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(order.getUserId());
-                uv.setUserName(order.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date oneYear = new Date(x);
-                uv.setSubject2(oneYear);
-                uv.setSubject3(oneYear);
-                uv.setSubject4(oneYear);
-                userVipService.save(uv);
-                this.save(orderInfo);
-            }
-        } else if ("科三+科四VIP".equals(orderInfo.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(orderInfo.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km3Date = userVip.getSubject3();
-                Date km4Date = userVip.getSubject4();
-                if (km3Date != null) { //科目三处理
-                    long x = km3Date.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                if (km4Date != null) { //科目四处理
-                    long x = km4Date.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-                this.save(orderInfo);
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(order.getUserId());
-                uv.setUserName(order.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date oneYear = new Date(x);
-                uv.setSubject3(oneYear);
-                uv.setSubject4(oneYear);
-                userVipService.save(uv);
-                this.save(orderInfo);
-            }
-        } else if ("全科目超级VIP".equals(order.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
+        } else if ("科目一二三四所有付费权益".equals(goodsName)) {
+            UserVip userVip = userVipService.getUserVipByUserId(userId);
             if (userVip != null) {
                 //修改会员信息
                 Date km1Date = userVip.getSubject1();
@@ -525,8 +292,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             } else {
                 //新增会员信息
                 UserVip uv = new UserVip();
-                uv.setUserId(order.getUserId());
-                uv.setUserName(order.getUserName());
+                uv.setUserId(userId);
+                uv.setUserName(userName);
                 long x = now.getTime() + oneYearLong;
                 Date oneYear = new Date(x);
                 uv.setSubject1(oneYear);
@@ -540,13 +307,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
     }
 
-    @Override
-    public void writeVipDataToDb(String goodsName, Long userId, String userName, String outTrandeNo, Integer total, Integer payType, String dqbh, String dqmc, int isStare, String school, String schoolName, int schoolCommission, int phoneType) {
-
-    }
-
-
-    //原来套餐
     @Override
     public void writeVipDataToDb(String goodsName, Long userId, String userName, String outTrandeNo, Integer total, Integer payType) {
         long oneYearLong = 1000 * 60 * 60 * 24 * 365l;

jsjp-service/src/main/java/com/miaxis/order/vo/QuerySchoolOrderListVo.java

@@ -0,0 +1,31 @@
+package com.miaxis.order.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+
+ */
+@Data
+@ApiModel(description = "驾校订单查询返回对象")
+public class QuerySchoolOrderListVo  {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
+
+    @ApiModelProperty(value = "驾校编号")
+    private String school;
+
+
+    @ApiModelProperty(value = "订单总金额")
+    private String orderTotal;
+
+    @ApiModelProperty(value = "驾校提成")
+    private String schoolCommission;
+
+
+}

jsjp-service/src/main/java/com/miaxis/wx/service/impl/RefundRecordServiceImpl.java

@@ -6,12 +6,15 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.miaxis.common.config.WxpayConfig;
 import com.miaxis.common.exception.CustomException;
+import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.service.IOrderInfoService;
 import com.miaxis.wx.domain.RefundRecord;
 import com.miaxis.wx.domain.WxJsOrder;
 import com.miaxis.wx.dto.WxNotifyReturnDTO;
 import com.miaxis.wx.mapper.RefundRecordMapper;
 import com.miaxis.wx.mapper.WxJsOrderMapper;
 import com.miaxis.wx.service.IRefundRecordService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
@@ -32,6 +35,7 @@ import java.util.List;
  * @date 2021-05-18
  */
 @Service
+@Slf4j
 public class RefundRecordServiceImpl extends ServiceImpl<RefundRecordMapper, RefundRecord> implements IRefundRecordService {
     @Resource
     private RefundRecordMapper refundRecordMapper;
@@ -39,6 +43,9 @@ public class RefundRecordServiceImpl extends ServiceImpl<RefundRecordMapper, Ref
     @Resource
     private WxJsOrderMapper wxJsOrderMapper;
 
+    @Autowired
+    private IOrderInfoService orderInfoService;
+
     @Autowired
     private HttpClient httpClient;
 
@@ -81,10 +88,17 @@ public class RefundRecordServiceImpl extends ServiceImpl<RefundRecordMapper, Ref
         // 返回数据：
         String bodyAsString = EntityUtils.toString(response.getEntity());
         if(response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){
+            log.info("退款成功，订单号:"+wxJsOrder);
             //更新这个字段
             wxJsOrder.setOutRefundNo(refundCode);
             wxJsOrder.setRefundReason(failCause);
+            wxJsOrder.setTradeType("3");
             wxJsOrderMapper.updateById(wxJsOrder);
+            OrderInfo orderInfo = orderInfoService.getByOutTradeNo(wxJsOrder.getOutTradeNo());
+            orderInfo.setOutRefundNo(refundCode);
+            orderInfo.setTradeType(3);
+            orderInfoService.updateById(orderInfo);
+
 
             //  保存退款数据到数据库
             RefundRecord refundRecord = new RefundRecord();

jsjp-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -40,4 +40,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from order_info where out_trade_no =#{outTradeNo}
     </select>
 
+    <select id="selectSchoolOrderInfoList"  resultType="com.miaxis.order.vo.QuerySchoolOrderListVo">
+        select
+        school,
+        school_name,
+        sum(school_commission) as school_commission,
+        sum(total) as orderTotal
+        from order_info
+        where is_share =1
+        <if test="schoolName != null  and schoolName != ''">
+            and school_name like concat('%', #{schoolName}, '%')
+        </if>
+        <if test="startTime != null">
+            and DATE_FORMAT(create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null">
+            and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+        </if>
+        group by school,school_name
+
+
+    </select>
+
 </mapper>