Merge branch 'master-prod-new' into master-test

chenjiahe

2024-01-08 3bf508c26ca8e8837197e358f5b4802d3ca59844

 crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java

@@ -1,8 +1,12 @@
package com.hz.crm.feign;

import com.hx.resultTool.Result;
import com.hz.crm.dto.FOrderPageDto;
import com.hz.crm.dto.OrderStatusDto;
import com.hz.crm.dto.order.refund.RefundDto;
import com.hz.crm.vo.order.OrderAddVo;
import com.hz.crm.vo.order.OrderConfirmVo;
import com.hz.crm.vo.order.OrderPayVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -25,4 +29,44 @@
     */
    @RequestMapping("/order/refund")
    Result refundOrder(@RequestBody(required = false) RefundDto refundDto);


    /**查询列表
     *
     * @param dto dto
     * @return refundReturnDto实体转化
     */
    @RequestMapping("/order/list")
    Result list(@RequestBody(required = false) FOrderPageDto dto);

    /**
     * 用户购买订单列表
     */
    @RequestMapping("/order/user/buy/list")
    Result userBuyList(@RequestBody FOrderPageDto dto);

    /**
     * 积分订单确认数据
     */
    @RequestMapping("/order/integral-crm/confirm-order")
    Result integralOrderConfirm(@RequestBody OrderConfirmVo orderConfirmVo);

    /**
     * 积分订单下单组合数据
     */
    @RequestMapping("/order/integral/get/add-data")
    Result getAddOrderData(@RequestBody OrderAddVo orderAddVo);

    /**
     * 积分订单下单
     */
    @RequestMapping("/order/integral-crm/add")
    Result integralOrderAdd(@RequestBody OrderAddVo orderAddVo);

    /**
     * 订单支付
     */
    @RequestMapping("/pay/unify-create")
    Result orderPay(@RequestBody OrderPayVo orderPayVo);

}