feat:第三方支付查询订单详情

2025-05-08 16:16:37 +08:00
1 parent e12828656f
commit 2727c3627c
@@ -48,4 +48,9 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
     */
    private Boolean isFindCarList = false;

+    /**
+     * 退款相关
+     */
+    private String afterSaleNo;
+
 }
@@ -3,6 +3,7 @@ package com.bsd.pjcloud.hard.api.feign;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPaySoureBizTypeEnum;
+import com.bsd.pjcloud.thirdparty.dto.pay.PayDetailDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.PayDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.RefundDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.WaterDto;
@@ -41,4 +42,11 @@ public interface RemoteHardThirdPayService {
    @NoToken
    @PostMapping("/hard-third-pay/water")
    PayBaseVo<List<PayWaterVo>> waterList(@RequestBody WaterDto dto, @RequestParam ThirdPaySoureBizTypeEnum soureType);
+
+    /**
+     * 订单详情
+     */
+    @NoToken
+    @PostMapping("/hard-third-pay/detail")
+    PayBaseVo<PayWaterVo> orderDetail(@RequestBody PayDetailDto dto, @RequestParam ThirdPaySoureBizTypeEnum soureType);
 }
@@ -257,7 +257,7 @@ public class HardOrderController {
                dto.setMchIds(mchDtoIds);
            }
        }
-        List<HardOrderVo> list = hardwareOrderService.scopeList(dto);
+        List<HardOrderVo> list = hardwareOrderService.scopeList(dto, DataScope.of());
        List<HardOrderExcelVo> excelList = BeanUtils.toBean(list, HardOrderExcelVo.class);
        try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream("file/订单交易汇总.xlsx")).build()) {
            WriteSheet writeSheet = EasyExcel.writerSheet().build();
@@ -4,6 +4,7 @@ import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.hard.service.HardThirdPayService;
 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPaySoureBizTypeEnum;
+import com.bsd.pjcloud.thirdparty.dto.pay.PayDetailDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.PayDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.RefundDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.WaterDto;
@@ -54,4 +55,12 @@ public class HardThirdPayController {
        return hardThirdPayService.waterList(dto, soureType);
    }

+    @Inner
+    @PostMapping("/detail")
+    @SysLog("订单详情")
+    @Operation(summary = "订单详情")
+    public PayBaseVo<PayWaterVo> orderDetail(@RequestBody PayDetailDto dto, @RequestParam ThirdPaySoureBizTypeEnum soureType) {
+        return hardThirdPayService.orderDetail(dto, soureType);
+    }
+
 }
@@ -7,6 +7,7 @@ import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.hard.api.dto.order.HardAfterSaleLogDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleLogEntity;
 import com.bsd.pjcloud.hard.api.vo.order.HardAfterSaleLogVo;
+import com.bsd.pjcloud.hard.api.vo.order.HardAfterSaleVo;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;

@@ -110,6 +110,8 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {

    Page<HardOrderVo> scopePageList(Page page, @Param("dto") HardOrderDto dto, DataScope dataScope);

+    List<HardOrderVo> scopeList(@Param("dto") HardOrderDto dto, DataScope dataScope);
+
    List<HardOrderSbVo> listSb(@Param("dto") HardOrderDto dto, DataScope dataScope);

    List<HardOrderCsVo> listCs(@Param("dto") HardOrderDto dto, DataScope dataScope);
@@ -29,7 +29,7 @@ public interface HardOrderService extends IService<HardOrderEntity> {

    Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto, DataScope dataScope);

-    List<HardOrderVo> scopeList(HardOrderDto dto);
+    List<HardOrderVo> scopeList(HardOrderDto dto, DataScope dataScope);

    HardOrderVo join(Long id);

@@ -2,6 +2,7 @@ package com.bsd.pjcloud.hard.service;


 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPaySoureBizTypeEnum;
+import com.bsd.pjcloud.thirdparty.dto.pay.PayDetailDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.PayDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.RefundDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.WaterDto;
@@ -28,4 +29,9 @@ public interface HardThirdPayService {
     * 获取流水
     */
    PayBaseVo<List<PayWaterVo>> waterList(WaterDto dto, ThirdPaySoureBizTypeEnum soureType);
+
+    /**
+     * 订单详情
+     */
+    PayBaseVo<PayWaterVo> orderDetail(PayDetailDto dto, ThirdPaySoureBizTypeEnum soureType);
 }
@@ -124,11 +124,10 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
    }

    @Override
-    public List<HardOrderVo> scopeList(HardOrderDto dto) {
-        List<HardOrderEntity> list = baseMapper.list(dto);
-        List<HardOrderVo> resultList = BeanUtils.toBean(list, HardOrderVo.class);
-        disposeList(resultList, dto);
-        return resultList;
+    public List<HardOrderVo> scopeList(HardOrderDto dto, DataScope dataScope) {
+        List<HardOrderVo> list = baseMapper.scopeList(dto, dataScope);
+        disposeList(list, dto);
+        return list;
    }

    /**
@@ -142,40 +141,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
    @Override
    public Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto, DataScope dataScope) {
        Page<HardOrderVo> list = baseMapper.scopePageList(page, dto, dataScope);
-        if (ObjectUtil.isNotEmpty(list.getRecords())) {
-            // 用户
-            List<Long> userIds = list.getRecords().stream().map(HardOrderVo::getUserId).filter(ObjectUtil::isNotEmpty).distinct().toList();
-            if (ObjectUtil.isNotEmpty(userIds)) {
-                R<List<SysUser>> userList = userService.getInnerUserById(new ArrayList<>(userIds));
-                if (ObjectUtil.isNotEmpty(userList.getData())) {
-                    DataUtil.convertUserList(list.getRecords(), CollectionUtils.convertMap(userList.getData(), SysUser::getUserId));
-                }
-            }
-            // 部门
-            List<Long> deptIds = list.getRecords().stream().map(HardOrderVo::getDeptId).filter(ObjectUtil::isNotEmpty).distinct().toList();
-            if (ObjectUtil.isNotEmpty(deptIds)) {
-                R<Map<Long, SysDept>> deptList = deptService.getDeptByDeptIds(deptIds);
-                if (ObjectUtil.isNotEmpty(deptList.getData())) {
-                    DataUtil.convertDeptList(list.getRecords(), deptList.getData());
-                }
-            }
-            // 商户
-            List<Long> mchIds = list.getRecords().stream().map(HardOrderVo::getMerchantId).filter(ObjectUtil::isNotEmpty).distinct().toList();
-            if (ObjectUtil.isNotEmpty(mchIds)) {
-                R<List<MchManageVo>> mchList = remoteMchService.getByIds(mchIds);
-                if (ObjectUtil.isNotEmpty(mchList.getData())) {
-                    WalletDataUtil.convertMchList(list.getRecords(), CollectionUtils.convertMap(mchList.getData(), MchManageVo::getId));
-                }
-            }
-            // 购物车
-            if (dto.getIsFindCarList()) {
-                for (HardOrderVo v : list.getRecords()) {
-                    List<HardCarEntity> carList = hardCarService.getByParentCarId(v.getParentCarId());
-                    List<HardCarVo> carVoList = BeanUtils.toBean(carList, HardCarVo.class);
-                    v.setCarList(carVoList);
-                }
-            }
-        }
+        disposeList(list.getRecords(), dto);
        return list;
    }

@@ -859,7 +825,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
        // 用户
        List<Long> userIds = list.stream().map(HardOrderVo::getUserId).filter(ObjectUtil::isNotEmpty).distinct().toList();
        if (ObjectUtil.isNotEmpty(userIds)) {
-            R<List<SysUser>> userList = userService.getUserById(new ArrayList<>(userIds));
+            R<List<SysUser>> userList = userService.getInnerUserById(new ArrayList<>(userIds));
            if (ObjectUtil.isNotEmpty(userList.getData())) {
                DataUtil.convertUserList(list, CollectionUtils.convertMap(userList.getData(), SysUser::getUserId));
            }
@@ -21,7 +21,7 @@ import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleLogEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
-import com.bsd.pjcloud.hard.api.vo.order.HardOrderPayTypeVo;
+import com.bsd.pjcloud.hard.api.vo.order.HardAfterSaleVo;
 import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo;
 import com.bsd.pjcloud.hard.config.LbCallbackConfig;
 import com.bsd.pjcloud.hard.mapper.order.HardAfterSaleLogMapper;
@@ -31,6 +31,7 @@ import com.bsd.pjcloud.hard.service.HardOrderService;
 import com.bsd.pjcloud.hard.service.HardThirdPayService;
 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPaySoureBizTypeEnum;
 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPayVoStatusEnum;
+import com.bsd.pjcloud.thirdparty.dto.pay.PayDetailDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.PayDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.RefundDto;
 import com.bsd.pjcloud.thirdparty.dto.pay.WaterDto;
@@ -66,6 +67,7 @@ public class HardThirdPayServiceImpl implements HardThirdPayService {
    private final HardOrderService hardOrderService;
    private final HardCarService hardCarService;
    private final HardAfterSaleService hardAfterSaleService;
+
    private final HardAfterSaleLogMapper hardAfterSaleLogMapper;

    private final RemoteMchService mchService;
@@ -277,9 +279,13 @@ public class HardThirdPayServiceImpl implements HardThirdPayService {
                item.setName(v.getUsername());
                item.setSignPhone(v.getUserMobile());
                item.setPlatformOrderId(String.valueOf(v.getId()));
-                item.setPlatformRefundId(String.valueOf(v.getAfterSaleId()));
+                if (ObjectUtil.isNotEmpty(v.getAfterSaleId())) {
+                    item.setPlatformRefundId(String.valueOf(v.getAfterSaleId()));
+                }
                item.setThirdOrderId(v.getOrderNo());
-                item.setThirdRefundId(String.valueOf(v.getAfterSaleNo()));
+                if (ObjectUtil.isNotEmpty(v.getAfterSaleNo())) {
+                    item.setThirdRefundId(String.valueOf(v.getAfterSaleNo()));
+                }
                item.setOrderStatus(v.getOrderStatus());
                item.setOrderPrice(v.getPayPrice());
                item.setRefundPrice(v.getRefundPrice());
@@ -298,6 +304,55 @@ public class HardThirdPayServiceImpl implements HardThirdPayService {
        return baseVo;
    }

+    /**
+     * 订单详情
+     */
+    @Override
+    public PayBaseVo<PayWaterVo> orderDetail(PayDetailDto dto, ThirdPaySoureBizTypeEnum soureType) {
+        // 返回值
+        PayBaseVo baseVo = new PayBaseVo<PayWaterVo>();
+        String orderType = getOrderType(soureType);
+        HardOrderDto query = new HardOrderDto();
+        query.setOrderType(orderType);
+        query.setOrderNo(dto.getThirdOrderId());
+        query.setAfterSaleNo(dto.getThirdRefundId());
+        List<HardOrderVo> hardOrderVos = hardOrderService.scopeList(query, null);
+        if (ObjectUtil.isEmpty(hardOrderVos)) {
+            baseVo.set(ThirdPayVoStatusEnum.ORDER_EXIST);
+            return baseVo;
+        }
+        if (hardOrderVos.size() > 1) {
+            baseVo.set(ThirdPayVoStatusEnum.DETAIL_ITEM_NOT_ONE);
+            return baseVo;
+        }
+        HardOrderVo order = hardOrderVos.get(0);
+        // 组合返回参数
+        PayWaterVo item = new PayWaterVo();
+        item.setUserId(order.getUserId());
+        item.setName(order.getUsername());
+        item.setSignPhone(order.getUserMobile());
+        item.setPlatformOrderId(String.valueOf(order.getId()));
+        if (ObjectUtil.isNotEmpty(order.getAfterSaleId())) {
+            item.setPlatformRefundId(String.valueOf(order.getAfterSaleId()));
+        }
+        item.setThirdOrderId(order.getOrderNo());
+        if (ObjectUtil.isNotEmpty(order.getAfterSaleNo())) {
+            item.setThirdRefundId(String.valueOf(order.getAfterSaleNo()));
+        }
+        item.setOrderStatus(order.getOrderStatus());
+        item.setOrderPrice(order.getPayPrice());
+        item.setRefundPrice(order.getRefundPrice());
+        if (ObjectUtil.isNotEmpty(order.getPayTime())) {
+            item.setPayTime(LocalDateTimeUtil.format(order.getPayTime(), DatePattern.NORM_DATETIME_PATTERN));
+        }
+        if (ObjectUtil.isNotEmpty(order.getRefundTime())) {
+            item.setRefundTime(LocalDateTimeUtil.format(order.getRefundTime(), DatePattern.NORM_DATETIME_PATTERN));
+        }
+        baseVo.set(ThirdPayVoStatusEnum.SUCCESS);
+        baseVo.setData(item);
+        return baseVo;
+    }
+
    /**
     * 查询美好生活默认商户信息
     */
@@ -82,6 +82,9 @@

    <sql id="whereA">
        a.del_flag = '0'
+        <if test="dto.orderNo != null and dto.orderNo != '' ">
+            and a.order_no = #{dto.orderNo}
+        </if>
        <if test="dto.orderStatus != null and dto.orderStatus != '' ">
            and a.order_status = #{dto.orderStatus}
        </if>
@@ -179,7 +182,7 @@
        </if>
    </sql>

-    <select id="scopePageList" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderVo">
+    <sql id="pageList">
        <include refid="selectA"/>
        m.name as hardName,
        m.type as hardType,
@@ -200,8 +203,19 @@
                    #{v}
                </foreach>
            </if>
+            <if test="dto.afterSaleNo != null and dto.afterSaleNo != ''">
+                and s.no = #{dto.afterSaleNo}
+            </if>
        </where>
        order by a.create_time desc, a.user_id desc
+    </sql>
+
+    <select id="scopePageList" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderVo">
+        <include refid="pageList"/>
+    </select>
+
+    <select id="scopeList" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderVo">
+        <include refid="pageList"/>
    </select>

    <select id="listSb" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderSbVo">
@@ -16,6 +16,7 @@ public enum ThirdPayApiBizTypeEnum {
    REFUND("20", "退款"),
    WALLET_INFO("30", "钱包详情"),
    WATER("40", "流水"),
+    DETAIL("50", "订单详情"),
    ;

    private final String type;
@@ -19,9 +19,11 @@ public enum ThirdPayVoStatusEnum {
    USER_EXIST(501, "用户不存在"),
    ORDER_EXIST(502, "订单不存在"),
    MCH_EXIST(503, "第三方商户未配置"),
+    ORDER_REFUND_EXIST(504, "订单未退款"),
    BALANCE_NOT_ENOUGH(505, "用户余额不足"),
    ORDER_HAVE_PAY(506, "订单已支付"),
    ORDER_HAVE_REFUND(507, "订单已退款"),
+    DETAIL_ITEM_NOT_ONE(508, "查询详情条目不为一"),
    UNKNOWN_ERROR(599, "未知错误,请联系管理员"),
    ;

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.thirdparty.dto.pay;
+
+import lombok.Data;
+
+@Data
+public class PayDetailDto {
+
+    /**
+     * 第三方订单id(thirdOrderId、thirdRefundId二选一)
+     */
+    private String thirdOrderId;
+
+    /**
+     * 第三方退款(thirdOrderId、thirdRefundId二选一,有退款操作才能查询到数据,否则返回null)
+     */
+    private String thirdRefundId;
+
+}
@@ -62,5 +62,13 @@ public class ThirdPayApiController {
        return thirdPayApiService.water(body, headers);
    }

+    @Inner(value = false)
+    @Operation(summary = "订单详情", description = "订单详情")
+    @PostMapping("/detail")
+    public PayBaseVo<PayWaterVo> detail(HttpEntity<String> httpEntity, @RequestHeader Map<String, String> headers) {
+        String body = httpEntity.getBody();
+        return thirdPayApiService.detail(body, headers);
+    }
+

 }
@@ -30,4 +30,9 @@ public interface ThirdPayApiService {
     * 流水查询
     */
    PayBaseVo<List<PayWaterVo>> water(String json, Map<String, String> headers);
+
+    /**
+     * 订单详情
+     */
+    PayBaseVo<PayWaterVo> detail(String json, Map<String, String> headers);
 }
@@ -7,10 +7,7 @@ import com.bsd.pjcloud.hard.api.feign.RemoteHardThirdPayService;
 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPayApiBizTypeEnum;
 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPaySoureBizTypeEnum;
 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPayVoStatusEnum;
-import com.bsd.pjcloud.thirdparty.dto.pay.PayDto;
-import com.bsd.pjcloud.thirdparty.dto.pay.PayGetWalletInfoDto;
-import com.bsd.pjcloud.thirdparty.dto.pay.RefundDto;
-import com.bsd.pjcloud.thirdparty.dto.pay.WaterDto;
+import com.bsd.pjcloud.thirdparty.dto.pay.*;
 import com.bsd.pjcloud.thirdparty.entity.ThirdKeyManageEntity;
 import com.bsd.pjcloud.thirdparty.entity.api.ThirdPayLogEntity;
 import com.bsd.pjcloud.thirdparty.service.ThirdKeyManageService;
@@ -268,4 +265,62 @@ public class ThirdPayApiServiceImpl implements ThirdPayApiService {
            return baseVo;
        }
    }
+
+    /**
+     * 订单详情
+     */
+    @Override
+    public PayBaseVo<PayWaterVo> detail(String json, Map<String, String> headers) {
+        // 日志
+        long startTime = System.currentTimeMillis();
+        ThirdPayLogEntity logObj = ThirdPayLogEntity.builder().apiUrl("/third/third-pay-api/detail").bizType(ThirdPayApiBizTypeEnum.DETAIL.getType()).req(json).paySourceType(ThirdPaySoureBizTypeEnum.LB.getType()).build();
+        // 开始处理
+        PayBaseVo baseVo = new PayBaseVo<PayWaterVo>();
+        ThirdKeyManageEntity keySetting = keyManageService.checkSignAndReturnConfig(json, headers);
+        if (ObjectUtil.isEmpty(keySetting)) {
+            baseVo.set(ThirdPayVoStatusEnum.SIGN_ERROR);
+            // 日志
+            logObj.setRes(JSONUtil.toJsonStr(baseVo));
+            logObj.setTimeConsuming(Long.toString(System.currentTimeMillis() - startTime));
+            payLogService.save(logObj);
+            return baseVo;
+        }
+        PayDetailDto dto = JSONUtil.toBean(json, PayDetailDto.class);
+        if (ObjectUtil.isAllEmpty(dto.getThirdOrderId(), dto.getThirdRefundId())) {
+            baseVo.set(ThirdPayVoStatusEnum.PARAMS_ERROR);
+            // 日志
+            logObj.setRes(JSONUtil.toJsonStr(baseVo));
+            logObj.setTimeConsuming(Long.toString(System.currentTimeMillis() - startTime));
+            payLogService.save(logObj);
+            return baseVo;
+        }
+        try {
+            PayBaseVo<PayWaterVo> orderDetail = hardThirdPayService.orderDetail(dto, ThirdPaySoureBizTypeEnum.valueOfByType(keySetting.getBizType()));
+            if (ObjectUtil.isEmpty(orderDetail)) {
+                baseVo.set(ThirdPayVoStatusEnum.UNKNOWN_ERROR);
+                baseVo.setData(orderDetail);
+                // 日志
+                logObj.setRes(JSONUtil.toJsonStr(baseVo));
+                logObj.setTimeConsuming(Long.toString(System.currentTimeMillis() - startTime));
+                payLogService.save(logObj);
+                return baseVo;
+            }
+            // 加密一下手机号
+            if (ObjectUtil.isNotEmpty(orderDetail.getData())) {
+                PayWaterVo data = orderDetail.getData();
+                if (ObjectUtil.isNotEmpty(data.getSignPhone())) {
+                    data.setSignPhone(LbRetailSignUtils.sm4Encrypt(data.getSignPhone(), keySetting.getFieldKey()));
+                }
+            }
+            return orderDetail;
+        } catch (Exception e) {
+            log.error("|{}|订单详情,json|{}|headers|{}|", TAG, json, headers, e);
+            baseVo.set(ThirdPayVoStatusEnum.UNKNOWN_ERROR);
+            // 日志
+            logObj.setRes(JSONUtil.toJsonStr(baseVo));
+            logObj.setTimeConsuming(Long.toString(System.currentTimeMillis() - startTime));
+            payLogService.save(logObj);
+            return baseVo;
+        }
+    }
 }
@@ -39,6 +39,8 @@ public class PayTest {

    private final String waterUrl = "/third/third-pay-api/water";

+    private final String detailUrl = "/third/third-pay-api/detail";
+
    @Resource
    private ThirdKeyManageService keyManageService;

@@ -143,6 +145,19 @@ public class PayTest {
        log.info(res);
    }

+    // 查询订单详情
+    @Test
+    public void detail() throws Exception {
+        ThirdKeyManageEntity config = getLbConfig();
+        Map<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("thirdOrderId", "");
+        paramsMap.put("thirdRefundId", "10");
+        String body = JSONUtil.toJsonStr(paramsMap);
+        // 发送请求
+        String res = HttpRequest.post(baseUrl + detailUrl).contentType("application/json").header(apiCountersign(body)).body(body).execute().body();
+        log.info(res);
+    }
+
    private ThirdKeyManageEntity getLbConfig() {
        return keyManageService.get(ThirdKeyTypeEnum.LB);
    }