Merge branch 'fhx-prod-治疗单重构' into master-test

fhx

2023-06-14 866cb2f637fa8cf6617d17bc09cdaa25f633cd21

Merge branch 'fhx-prod-治疗单重构' into master-test

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java

@@ -4,6 +4,8 @@

import com.hz.his.dto.PageDto;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -38,4 +40,9 @@
    /*用户优惠券*/
    private String couponNumberId;

    //开单结账一起执行校验优惠券接口使用参数
    /** 优惠券商品JSON数组字符 */
    private String couponGoodsArr;
    /** 订单应付金额 */
    private BigDecimal shouldTotal;
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalDto.java

New file
@@ -0,0 +1,22 @@
package com.hz.his.dto.order;

import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * 订单计算应付金额
 * @USER: fhx
 * @DATE: 2023/6/13
 **/
@Data
public class OrderCountShouldTotalDto {

    //门店id
    private String shopId;
    //用户优惠券
    private String couponNumberId;
    //商品item信息
    private List<OrderCountShouldTotalItemDto> itemDtoList;
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderCountShouldTotalItemDto.java

New file
@@ -0,0 +1,24 @@
package com.hz.his.dto.order;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;

/**
 * 订单计算应付金额item信息
 * @USER: fhx
 * @DATE: 2023/6/13
 **/
@Data
public class OrderCountShouldTotalItemDto {
    //商品类型
    private String type;
    //商品id
    private String commonId;
    //购买数量
    private Integer buyNum;
    //订单折扣
    private BigDecimal discount = BigDecimal.ZERO;
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java

@@ -49,4 +49,10 @@
     */
    @PostMapping(value = "/coupon/check/coupon")
    Result checkCoupon(@RequestBody CouponDto couponDto);

    /**
     * 开放平台-检查优惠券是否可用 - 开单结账同时执行使用
     */
    @PostMapping(value = "/coupon/check/coupon/to/orderAndPay")
    Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java

@@ -173,4 +173,12 @@
    @PostMapping(value = "/order/refund/cancel")
    Result refundCancel(@RequestBody RefundCancelVo refundCancelVo);


    /**
     * 计算订单应付金额
     */
    @PostMapping(value = "/order/countOrderShouldTotal")
    Result countOrderShouldTotal(@RequestBody OrderCountShouldTotalDto dto);


}