修改配置

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

@@ -6,12 +6,17 @@ 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 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
  *
@@ -24,6 +29,11 @@ import java.util.List;
 public class OrderInfoController extends BaseController{
     @Autowired
     private IOrderInfoService orderInfoService;
+    @Autowired
+    private IWxJsOrderService wxJsOrderService;
+
+    @Autowired
+    private IRefundRecordService refundRecordService;
 
     /**
      * 查询订单信息列表
@@ -39,18 +49,23 @@ 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));
+    @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,"极速驾培退款");
+        return Response.success();
     }
 
 

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

@@ -0,0 +1,57 @@
+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.service.IOrderInfoService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【订单信息】Controller
+ *
+ * @author miaxis
+ * @date 2022-06-07
+ */
+@RestController
+@RequestMapping("/order/info")
+@Api(tags={"【APP-订单信息】"})
+public class PcOrderInfoController extends BaseController{
+    @Autowired
+    private IOrderInfoService orderInfoService;
+
+    /**
+     * 查询订单信息列表
+     */
+    @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));
+    }
+
+
+
+}

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/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();