Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2023-07-28 7ac97b83b191cad2581f503cb8ea96b3711586ae

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

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

@@ -26,6 +26,9 @@
    /** 平台来源  因为是his助手取消订单的话就要自动确认退款单  必填*/
    private Integer platformSource;

    /** 取消订单备注 */
    private String remarks;

    /**his助手*/
    public static final Integer HIS_ASSISTANT = 0;
     /**his后台*/

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

New file
@@ -0,0 +1,24 @@
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;
    //订单应付金额
    private  BigDecimal shouldTotal;
    //商品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

@@ -56,4 +56,10 @@
     */
    @PostMapping(value = "/coupon/order/send/coupon")
    Result orderSendCoupon(@RequestBody OrderSendCouponDto 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

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


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


}