Merge remote-tracking branch 'origin/master'

童刚

2022-08-03 02e460a52667915cda6c4ebb58488646795c37ec

Merge remote-tracking branch 'origin/master'

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

 phis-feign/src/main/java/com/hz/his/constant/CouponPlatformConstants.java

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

/**
 * 平台常量
 *
 * @Author: wzh
 * @Date: 2022/08/02
 * @Description:
 */
public class CouponPlatformConstants {
    //预约
    public static String TYPE_PLATFORM_PHIS = "p-his";
    //艾心荟
    public static String TYPE_PLATFORM_CRM = "crm";
    //导医
    public static String TYPE_PLATFORM_GUIDE = "guide";
    //his助手
    public static String TYPE_PLATFORM_HIS = "his";
    public static String TYPE_PLATFORM_MA = "marketing_assistant";
    /**领建*/
    public static String TYPE_PLATFORM_PHISKIN = "PhiSkin";
}

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

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


import lombok.Data;

import java.util.List;

/**
 * @author wzh
 * 订单创建扩展
 */
@Data
public class OrderCreateDto {

    private OrdersTotalDto orderTotal;

    private List<OrderItemDto> orderItem;

    private List<OrderDeveloperDto> orderDeveloper;

    private List<String> cardItemInfoIds;

    private String operatorId;

    private String shopId;

}

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

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

import java.util.Date;

/**
 * 订单与开发人关联表(默认:用户绑定的所属顾问)
 */
public class OrderDeveloperDto {

    private String id;
    private Date createTime;
    private Date editTime;

    /** 订单id（OrdersTotal） */
    private String orderId;

    /** 开单人门店标识(默认:用户绑定的所属顾问) */
    private String shopId;
    /** 开单人门店名称(默认:用户绑定的所属顾问)*/
    private String shopName;

    /** 开单人员工标识(默认:用户绑定的所属顾问)*/
    private String employeeId;
     /** 开单人员工名称(默认:用户绑定的所属顾问)*/
    private String employeeName;

     /** 类型(美容师/医生)*/
    private String type;

    public String getOrderId() {
        return orderId;
    }

    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }

    public String getShopId() {
        return shopId;
    }

    public void setShopId(String shopId) {
        this.shopId = shopId;
    }

    public String getShopName() {
        return shopName;
    }

    public void setShopName(String shopName) {
        this.shopName = shopName;
    }

    public String getEmployeeId() {
        return employeeId;
    }

    public void setEmployeeId(String employeeId) {
        this.employeeId = employeeId;
    }

    public String getEmployeeName() {
        return employeeName;
    }

    public void setEmployeeName(String employeeName) {
        this.employeeName = employeeName;
    }

    public String getType() {
        return type;
    }

    public void setType(String type) {
        this.type = type;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public Date getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }

    public Date getEditTime() {
        return editTime;
    }

    public void setEditTime(Date editTime) {
        this.editTime = editTime;
    }
}

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

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

import lombok.Data;

/**
 * @author wzh
 * 订单结账扩展
 */
@Data
public class OrderPayDto {

    /** 是否是按项目付款,0:否,1:是 */
    private Integer type;
    /** 订单id */
    private String orderId;
    /** 应付的总金额 */
    private String total;
    /** 用户真正支付的金额集合 */
    private String amount;
    /** 操作人员信息json */
    private String operator;
    /** 操作人员id */
    private String operatorId;
    /** 优惠券id */
    private String userCouponId;
    /** 用户资金信息 */
    private String userMoney;

}

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

New file
@@ -0,0 +1,23 @@
package com.hz.his.dto.user.coupon;


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

import java.math.BigDecimal;

/**
 * @author wzh
 * 商品可用优惠券扩展
 * */
@Data
public class GoodsCanUseCouponDto extends PageDto {
    /**用户标识*/
    private String userId;
    /**sku标识*/
    private String skuId;
    /**商品类型*/
    private String goodType;
    /**商品金额*/
    private BigDecimal price;
}

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

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

import lombok.Data;

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

/**
 * @author wzh
 * 判断订单是否可用该优惠券的订单信息
 * */
@Data
public class OrderCanUseCouponDto {
    /**用户标识*/
    private String userId;
    /**优惠券标识*/
    private String couponId;
    /**订单金额*/
    private BigDecimal total;
    /**购买件数*/
    private Integer itemNum;
    /**子订单商品信息列表*/
    private List<OrderItemCouponDto> itemList;
}

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

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


import lombok.Data;

import java.math.BigDecimal;

/**
 * @author wzh
 * 判断订单是否可用该优惠券的订单信息
 * */
@Data
public class OrderItemCouponDto {
    /**商品类型*/
    private String goodsType;
    /**商品标识*/
    private String goodsId;
    /**sku标识*/
    private String goodsSkuId;
    /**购买商品数量*/
    private Integer goodsNum;
    /**订单金额*/
    private BigDecimal total;
}

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

@@ -20,6 +20,6 @@
    private BigDecimal total;
    /**满足件数*/
    private Integer itemNum;
    /**商品对应的his标识*/
    /**商品crm sku标识*/
    private List<HisGoodsDto> hisGoodsDtoList;
}

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

@@ -6,6 +6,8 @@
import com.hz.his.dto.user.UserLevelDto;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
import com.hz.his.dto.user.coupon.GoodsCanUseCouponDto;
import com.hz.his.dto.user.coupon.OrderCanUseCouponDto;
import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.money.*;
@@ -112,6 +114,18 @@
    @PostMapping(value = "/user/can/use/coupon")
    Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);

    /**
     * 获取商品可用优惠券
     * */
    @PostMapping(value = "/goods/can/use/coupon")
    Result goodsCanUseCoupon(@RequestBody GoodsCanUseCouponDto goodsCanUseCouponDto);

    /**
     * 判断订单是否可用该优惠券
     */
    @PostMapping(value = "/order/can/use/coupon")
    Result orderCanUseCoupon(@RequestBody OrderCanUseCouponDto orderCanUseCouponDto);


    /**
     * 获取用户增值金列表

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

@@ -30,6 +30,12 @@
    @PostMapping(value = "/coupon/cancel/coupon")
    Result cancelUserCoupon(@RequestBody CouponDto couponDto);


    /**
     * 开放平台-获取艾心荟优惠券2.0列表
     * @param dto
     * @return
     */
    @PostMapping(value = "/coupon/get/Coupon")
    Result getCoupon(@RequestBody CouponDto dto);

}

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

@@ -1,9 +1,10 @@
package com.hz.his.feign.service.platform;

//import com.hx.phiappt.model.order.OrdersTotal;
//import com.hx.phip.dto.order.OrderCreateDto;
//import com.hx.phip.dto.order.OrderPayDto;
import com.hx.resultTool.Result;
import com.hz.his.dto.order.OrderCreateDto;
import com.hz.his.dto.order.OrderPayDto;
import com.hz.his.dto.order.OrderRefundDto;
import com.hz.his.dto.order.OrdersTotalDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -14,34 +15,34 @@
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-order")
public interface SPhipOrderService {

//    /**
//     * 开放平台-新-新增订单更新至phis
//     */
//    @PostMapping(value = "/newSync/order/add")
//    Result createOrder(@RequestBody OrderCreateDto params);
//
//    /**
//     * 开放平台-新-订单状态更新至phis
//     */
//    @PostMapping(value = "/newSync/order/orderUpdate")
//    Result updateOrderStatus(@RequestBody OrdersTotal params);
//
//    /**
//     * 开放平台-新-订单结账更新至phis
//     */
//    @PostMapping(value = "/newSync/order/pay")
//    Result payOrderSuc(@RequestBody OrderPayDto params);
//
//    /**
//     * 开放平台-新-订单退款更新至phis
//     */
//    @PostMapping(value = "/newSync/order/refund")
//    Result refundOrder(String params);
//
//    /**
//     * 开放平台-新-取消订单更新至phis
//     */
//    @PostMapping(value = "/newSync/order/cancel")
//    Result cancelOrder(String params);
    /**
     * 开放平台-新-新增订单更新至phis
     */
    @PostMapping(value = "/newSync/order/add")
    Result createOrder(@RequestBody OrderCreateDto params);

    /**
     * 开放平台-新-订单状态更新至phis
     */
    @PostMapping(value = "/newSync/order/orderUpdate")
    Result updateOrderStatus(@RequestBody OrdersTotalDto params);

    /**
     * 开放平台-新-订单结账更新至phis
     */
    @PostMapping(value = "/newSync/order/pay")
    Result payOrderSuc(@RequestBody OrderPayDto params);

    /**
     * 开放平台-新-订单退款更新至phis
     */
    @PostMapping(value = "/newSync/order/refund")
    Result refundOrder(@RequestBody OrderRefundDto params);

    /**
     * 开放平台-新-取消订单更新至phis
     */
    @PostMapping(value = "/newSync/order/cancel")
    Result cancelOrder(@RequestBody OrderRefundDto params);

}