phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -51,4 +51,9 @@ /** 是否是营销助手申请 0=否 1=是*/ private Integer isMarketApply = 0; /** 优惠券分类ID*/ private String couponTypeId; /** 基础分类-优惠券*/ private String type; } phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -39,4 +39,6 @@ public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details"; /**公共标识类型,订单购买优惠券*/ public static final String TYPE_COMMON_ORDER = "order"; /**公共标识类型,抽奖活动*/ public static final String TYPE_COMMON_DRAW = "draw"; } phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,7 +1,5 @@ package com.hz.his.dto.user; import com.gitee.sunchenbin.mybatis.actable.annotation.Column; import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant; import com.hz.his.dto.PageDto; import lombok.Data; @@ -39,9 +37,9 @@ private Integer isHaveShop; /**是否有顾问*/ private Integer isHaveCorp; /**开始时间*/ private Date startTime; /**结束时间*/ private Date endTime; } phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -99,4 +99,6 @@ public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701"; /**操作方式-活动参与*/ public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join"; /**操作方式-营销助手积分兑换优惠券*/ public static final String OPERATION_REASON_EXCHANGE_COUPON_USE_INTEGRAL = "exchange_coupon_use_integral"; } phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -130,4 +130,11 @@ */ @PostMapping(value = "/coupon/user/goods") Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto); /** * 查询优惠券分类 */ @PostMapping(value = "/coupon/type/list") Result getCouponTypeList(@RequestBody(required = false) CouponDto dto); } phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -340,4 +340,8 @@ * */ @PostMapping(value = "/user/query/oldNewPerformance") Result queryOldNewPerformance(@RequestBody UserDto userDto); @PostMapping(value = "/user/draw/list") Result drawGetUserDt(@RequestBody UserDto userDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
@@ -2,7 +2,6 @@ import com.hx.resultTool.Result; import com.hz.his.vo.order.refund.qr.RefundQrVo; import com.hz.his.vo.payment.PayNoVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
@@ -1,7 +1,7 @@ package com.hz.his.feign.service.platform.payment; import com.hx.resultTool.Result; import com.hz.his.vo.payment.PayNoVo; import com.hz.phis.vo.payment.PayNoVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/PaymentService.java @@ -1,8 +1,7 @@ package com.hz.his.feign.service.platform.payment; import com.hx.resultTool.Result; import com.hz.his.vo.payment.PayNoVo; import com.hz.phis.vo.payment.qr.OrderQrVo; import com.hz.phis.vo.payment.qr.OrderQrPayVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -11,13 +10,13 @@ * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀 */ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "payment-qr") public interface PaymentService { public interface SPaymentService { /** * 获取支付编号，只返回支付编号 * data转化对象OrderQrResponeVo */ @PostMapping(value = "/payment/order/qr") Result orderQrPay(@RequestBody OrderQrVo orderQrVo); Result orderQrPay(@RequestBody OrderQrPayVo orderQrPayVo); } phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java
New file @@ -0,0 +1,49 @@ package com.hz.phis.dt.user; import lombok.Data; import java.util.Date; /**抽奖-用户详情数据返回实体*/ @Data public class UserDrawDt { /**是否员工:0否1是*/ private Integer isEmployee; /**标识*/ private String id; private String crmId; /**ciq会员号*/ private String ciq; /**名称*/ private String name; /**手机号*/ private String tel; /**生日yyyy-MM-dd*/ private String birthDay; /**注册时间*/ private Date regTime; /**用户会员名称*/ private String userLevel; /**用户会员等级编码*/ private String hisNo; /**用户会员等级id*/ private String memberLevelId; /**用户会员等级名称*/ private String memberName; /**来源id,顶级*/ private String channelId; /**来源,顶级*/ private String channelType; /**二级来源id,末级*/ private String channel2Id; /**二级来源,末级*/ private String channelType2; /**所属门店*/ private String shopId; /**所属门店名称*/ private String shopName; /**性别*/ private Integer gender; } phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
File was renamed from phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java @@ -1,4 +1,4 @@ package com.hz.his.vo.payment; package com.hz.phis.vo.payment; import lombok.Data;
File was renamed from phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrResponeVo.java @@ -7,7 +7,7 @@ * @author CJH */ @Data public class OrderQrResponeVo { public class OrderQrPayResponeVo { /**商户号-Y-32（商户在招行完成商户进件后分配的招行商户号）*/ private String merId; phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
File was renamed from phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java @@ -8,7 +8,7 @@ * @author CJH */ @Data public class OrderQrVo { public class OrderQrPayVo { /**N-32-第三方商户号，没有指定可不传*/ private String merId;
