分帐BUG列表等

nbjk-admin/src/main/java/com/miaxis/pc/controller/PcOrderSplitController.java

@@ -0,0 +1,62 @@
+package com.miaxis.pc.controller;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.order.domain.OrderSplit;
+import com.miaxis.order.service.IOrderSplitService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【分账记录】Controller
+ *
+ * @author miaxis
+ * @date 2024-01-31
+ */
+@RestController
+@RequestMapping("/order/split")
+@Api(tags={"【app-分账记录】"})
+public class PcOrderSplitController extends BaseController{
+    @Autowired
+    private IOrderSplitService orderSplitService;
+
+    /**
+     * 查询分账记录列表
+     */
+    @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<OrderSplit> list(@ModelAttribute OrderSplit orderSplit){
+        startPage();
+        List<OrderSplit> list = orderSplitService.selectOrderSplitList(orderSplit);
+        return toResponsePageInfo(list);
+    }
+    
+
+    /**
+     * 获取分账记录详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取分账记录详细信息")
+    public Response<OrderSplit> getInfo(
+            @ApiParam(name = "id", value = "分账记录参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(orderSplitService.getById(id));
+    }
+
+
+
+}

nbjk-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -99,12 +99,6 @@ public class OrderInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "退款订单编号")
     private String outRefundNo;
 
-    /** 分账订单编号 */
-    @Excel(name = "订单编号")
-    @TableField("out_split_no")
-    @ApiModelProperty(value = "订单编号")
-    private String outSplitNo;
-
 
     /** 总金额 */
     @Excel(name = "总金额")

nbjk-service/src/main/java/com/miaxis/order/domain/OrderSplit.java

@@ -16,7 +16,7 @@ import lombok.Data;
  * 分账记录对象 order_split
  *
  * @author miaxis
- * @date 2023-12-27
+ * @date 2024-01-31
  */
 @Data
 @TableName("order_split")
@@ -35,6 +35,14 @@ public class OrderSplit extends BaseBusinessEntity{
     @ApiModelProperty(value = "商户内部分账订单ID")
     private String outSplitNo;
 
+
+    /** 商户内部订单ID */
+    @Excel(name = "商户内部订单ID")
+    @TableField("out_trade_no")
+    @ApiModelProperty(value = "商户内部订单ID")
+    private String outTradeNo;
+
+
     /** 分账金额 */
     @Excel(name = "分账金额")
     @TableField("amount")

nbjk-service/src/main/java/com/miaxis/order/dto/OrderInfoDto.java

@@ -36,6 +36,10 @@ public class OrderInfoDto {
     @ApiModelProperty(value = "订单号")
     private String outTradeNo;
 
+    /** 订单号 */
+    @ApiModelProperty(value = "分账订单号")
+    private String outSplitNo;
+
     /** 退款订单号 */
     @ApiModelProperty(value = "退款订单号")
     private String outRefundNo;

nbjk-service/src/main/java/com/miaxis/order/mapper/OrderSplitMapper.java

@@ -8,7 +8,7 @@ import com.miaxis.order.domain.OrderSplit;
  * 分账记录Mapper接口
  *
  * @author miaxis
- * @date 2023-12-27
+ * @date 2024-01-31
  */
 public interface OrderSplitMapper extends BaseMapper<OrderSplit> {
     /**

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

@@ -3,8 +3,6 @@ package com.miaxis.order.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.OrderInfoDto;
-import com.miaxis.order.dto.OrderInfoMonthDto;
-import com.miaxis.order.vo.OrderInfoMonthVo;
 import com.miaxis.wx.domain.WxOrder;
 
 import java.util.List;

nbjk-service/src/main/java/com/miaxis/order/service/IOrderSplitService.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * 分账记录Service接口
  *
  * @author miaxis
- * @date 2023-12-27
+ * @date 2024-01-31
  */
 public interface IOrderSplitService extends IService<OrderSplit>{
     /**

nbjk-service/src/main/java/com/miaxis/order/service/impl/OrderSplitServiceImpl.java

@@ -16,7 +16,7 @@ import com.miaxis.order.service.IOrderSplitService;
  * 分账记录Service业务层处理
  *
  * @author miaxis
- * @date 2023-12-27
+ * @date 2024-01-31
  */
 @Service
 public class OrderSplitServiceImpl extends ServiceImpl<OrderSplitMapper, OrderSplit> implements IOrderSplitService {

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

@@ -11,7 +11,10 @@ import com.miaxis.common.config.WxPayXcxConfigImpl;
 import com.miaxis.common.config.WxpayConfig;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.exception.CustomException;
-import com.miaxis.common.utils.*;
+import com.miaxis.common.utils.RSAUtils;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.common.utils.XmlUtil;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.domain.OrderSplit;
 import com.miaxis.order.service.IOrderInfoService;
@@ -23,7 +26,6 @@ import com.miaxis.wx.domain.WxExtract;
 import com.miaxis.wx.domain.WxExtractBank;
 import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.WxExtractBankDTO;
-import com.miaxis.wx.dto.WxOrderProfitDTO;
 import com.miaxis.wx.mapper.WxOrderMapper;
 import com.miaxis.wx.service.IWxExtractBankService;
 import com.miaxis.wx.service.IWxExtractService;
@@ -37,7 +39,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -198,11 +199,11 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         }
         //更新成交订单表
        // OrderInfo orderInfo = orderInfoService.getByOutTradeNo(wxOrder.getOutTradeNo());
-        orderInfo.setOutSplitNo(orderCode);
         orderInfo.setProfitSharing(2);
         orderInfoService.updateById(orderInfo);
         OrderSplit orderSplit = new OrderSplit();
         orderSplit.setOutSplitNo(orderCode);
+        orderSplit.setOutTradeNo(orderInfo.getOutTradeNo());
         orderSplit.setAmount(amount);
 
         orderSplit.setOpenId(account);

nbjk-service/src/main/resources/mapper/order/OrderSplitMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.order.mapper.OrderSplitMapper">
+
+    <resultMap type="OrderSplit" id="OrderSplitResult">
+        <result property="id"    column="id"    />
+        <result property="outSplitNo"    column="out_split_no"    />
+        <result property="outTradeNo"    column="out_trade_no"    />
+        <result property="amount"    column="amount"    />
+        <result property="openId"    column="open_id"    />
+        <result property="description"    column="description"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectOrderSplitVo">
+        select * from order_split
+    </sql>
+
+    <select id="selectOrderSplitList" parameterType="OrderSplit" resultMap="OrderSplitResult">
+        <include refid="selectOrderSplitVo"/>
+        <where>
+            <if test="outSplitNo != null  and outSplitNo != ''"> and out_split_no = #{outSplitNo}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="openId != null  and openId != ''"> and open_id = #{openId}</if>
+            <if test="description != null  and description != ''"> and description = #{description}</if>
+        </where>
+    </select>
+
+</mapper>