fwq
2023-06-26 039978dca47d69401c59ae9ce57224b17214aa56
订单支付申请
3个文件已修改
1个文件已添加
38 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java
New file
@@ -0,0 +1,23 @@
package com.hz.his.dto.marketing;
import com.hz.his.dto.order.OrdersTotalDto;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
 * 营销助手订单支付申请入参
 * @author fwq
 */
@Data
public class OrderPayMarketingDto extends MarketingDto{
    /*******************必填项(注意继承的公共类MarketingDto)*************************/
    /**订单信息*/
    private OrdersTotalDto ordersTotalDto;
    /**订单折扣(单位:百分比)*/
    private BigDecimal discountNum;
    /**订单项目信息*/
    private List<RefundProjectDto> projectDtoList;
}
phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
@@ -17,4 +17,6 @@
    private String projectName;
    /**退的数量 商品/项目/... - 必填*/
    private Integer refundNum;
    /**买的数量 商品/项目/...*/
    private Integer buyNum;
}
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
@@ -4,6 +4,7 @@
import com.hz.his.dto.marketing.OrderCancelDto;
import com.hz.his.dto.marketing.OrderDiscountDto;
import com.hz.his.dto.marketing.OrderPartRefundDto;
import com.hz.his.dto.marketing.OrderPayMarketingDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,4 +35,10 @@
    @PostMapping(value = "/order/apply/part/refund")
    Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);
    /**
     * 订单支付申请
     */
    @PostMapping(value = "/order/apply/order/pay")
    Result orderPay(@RequestBody OrderPayMarketingDto orderPayMarketingDto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -106,6 +106,12 @@
    Result marketingAduit(@RequestBody AduitDto dto);
    /**
     * 开放平台-营销助手订单支付审核通过/拒绝接口
     */
    @PostMapping(value = "/audit/marketing/aduit/pay")
    Result marketingAduitPay(@RequestBody AduitDto dto);
    /**
     * 开放平台-营销助手订单取消审核通过/拒绝接口
     */
    @PostMapping(value = "/audit/order/cancel")