From 86793208b129e192649e4fa153887b27468046e0 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期一, 05 九月 2022 16:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 18 ++++++--
phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 2 +
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java | 28 ++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 10 ++--
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 8 +++
phis-feign/src/main/java/com/hz/phis/dt/user/UserHaveDt.java | 18 +++++++++
phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java | 4 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 20 +++++-----
11 files changed, 92 insertions(+), 22 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index 261dc7e..a2c339b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -27,4 +27,6 @@
public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
/**鍏叡鏍囪瘑绫诲瀷,鑰佸甫鏂�*/
public static String TYPE_COMMON_OLD_NEW = "old_new";
+ /**鍏叡鏍囪瘑绫诲瀷,鍥㈣喘娲诲姩*/
+ public static String TYPE_COMMON_GIFT = "gift";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index e69c4b6..850fa93 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -16,7 +16,11 @@
public class OrderItemPHisDto {
/**蹇呭～ 鍟嗗搧绫诲瀷(OrderItemConstants) crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞～retail闆跺敭, */
private String type;
- /**蹇呭～ 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100*/
+ /**蹇呭～ 瀛愬崟鎬讳环锛屽疄浠樹环鏍硷紙鍏冿級(鏆傛椂鐢ㄤ笉涓�)*/
+ private BigDecimal total;
+ /**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
+ private BigDecimal totalIntegral;
+ /**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
private Integer buyNum;
@@ -33,6 +37,8 @@
private String userCardId;
/**闈炲繀濉� 骞冲彴绫诲瀷鍏宠仈鍟嗗搧id 鍦╬his涓嬪崟crm鍟嗗搧蹇呭～*/
private String platformTypeId;
+ /**闈炲繀濉� 骞冲彴绫诲瀷(鑹惧績鑽熴�乸-his銆佸叾浠�,榛樿p-his)*/
+ private String platformType;
/**闈炲繀濉� 鍗″寘鏍囪瘑 */
private List<CardItemInfoDto> cardItemInfoIds;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index 34efcb5..9e8f49c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -14,7 +14,7 @@
*/
@Data
public class OrderPHisDto extends PageDto {
- //type:0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处,crm濉�2锛屽繀濉�
+ //type:0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处(鐩墠缁撹处鍜屽垱寤烘槸鍒嗗紑鐨�),crm濉�2锛屽繀濉�
private String type;
//鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭～
private String operatorId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 6fd69ed..52a1938 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -27,21 +27,21 @@
* 閿�鍞钩鍙扮紪鐮�,渚嬪:娣樺疂,鍦ㄧ數鍟嗗钩鍙拌缃噷闈紝鍦ㄧ涓夋柟骞冲彴閰嶇疆,蹇呭～,crm榛樿濉玞rm
* */
private String sourceCode;
- /**蹇呭～ 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,crm榛樿濉玞rm*/
+ /**闈炲繀濉� 璁㈠崟鏉ユ簮鍚嶇О(鍐椾綑) ,crm榛樿濉玞rm,(鍚庡彴澶勭悊)*/
private String sourceName;
/**crm蹇呭～ 绗笁鏂硅鍗曞彿,濉玞rm鐨勮鍗曞彿*/
private String sourceOrderNo;
- /** 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
+ /**闈炲繀濉� 鍏戞崲鐮�(绗笁鏂瑰厬鎹㈢爜) */
private String conversionCode;
- /**蹇呭～ 寮�鍙戜汉闂ㄥ簵鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
+ /**蹇呭～ 寮�鍙戜汉闂ㄥ簵鏍囪瘑(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑闂ㄥ簵) */
private String developerShopId;
/**crm蹇呭～ 寮�鍙戜汉鏍囪瘑(Shop,娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鏍囪瘑) 涓夊皯璇达細crm灏卞～鐢ㄦ埛*/
private String developerId;
- /**crm蹇呭～ 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞～鐢ㄦ埛*/
+ /**闈炲繀濉� 寮�鍙戜汉鍚嶇О(娌℃湁浼犲�奸粯璁ょ敤鎴风粦瀹氶攢鍞【闂殑鍚嶇О) 涓夊皯璇达細crm灏卞～鐢ㄦ埛锛屼笉浼�,鍚庡彴澶勭悊*/
private String developerName;
- /**蹇呭～ 鐢ㄦ埛Id */
+ /**蹇呭～ 璁㈠崟鎵�灞炵敤鎴稩d */
private String userId;
/**crm蹇呭～ 璁㈠崟娓犻亾鏍囪瘑锛堟笭閬�/鐢ㄦ埛锛�,涓夊皯璇达細crm蹇呭～ */
@@ -51,18 +51,18 @@
/**crm蹇呭～ 璁㈠崟鎺ㄨ崘浜烘爣璇�,涓夊皯璇达細crm蹇呭～ */
private String inviteeId;
- /**crm蹇呭～ 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭～ */
+ /**闈炲繀濉� 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭～ 涓嶄紶,鍚庡彴澶勭悊*/
private String inviteeName;
/**蹇呭～ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭～1锛屽惁鍒�0*/
private int hisSynStatus;
- /**蹇呭～ 璁㈠崟鍏朵粬淇℃伅*/
- private OrderInfoDto orderInfo;
-
- /**鍏呭�艰鍗曞繀濉� 璁㈠崟鎬婚噾棰� */
+ /**蹇呭～ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
private BigDecimal total;
+ /**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
+ private OrderInfoDto orderInfo;
+
/**闈炲繀濉� 璧犻�侀噾棰� */
private BigDecimal givingAmount;
/**闈炲繀濉� 璧犻�侀噾棰濈被鍨�(GivingAmountType) */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java
new file mode 100644
index 0000000..d4e3418
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserHaveDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.user;
+
+import lombok.Data;
+
+/**鐢ㄦ埛鎷ユ湁鏌ヨ瀹炰綋*/
+@Data
+public class UserHaveDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+
+ /*************浼樻儬鍒告煡璇㈠弬鏁�******************/
+ /**鏄惁鏈夋晥*/
+ private Integer validState;
+ /**鏄惁杩囨湡*/
+ private Integer isExpired;
+ /**鏄惁浣跨敤*/
+ private Integer isUse;
+ /**骞冲彴*/
+ private String platform;
+
+ /************棰勭害鏌ヨ鍙傛暟***************************/
+ /**鏄惁鍒板簵*/
+ private Integer isArrive;
+
+ /************椤圭洰鏌ヨ鍙傛暟**************************/
+ /**鏄惁鏈嶅姟*/
+ private Integer isService;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
index 31d9e5c..3ca5adc 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
@@ -55,6 +55,10 @@
private String orderNo;
/**鐢ㄦ埛浼樻儬鍒告爣璇�*/
private String userCouponId;
+ /**骞冲彴绫诲瀷*/
+ private String platform;
+ /**鍒楄〃鐘舵��:0鍏ㄩ儴1鏈娇鐢�2宸蹭娇鐢�3宸茶繃鏈�*/
+ private Integer listStatus;
/**棰嗗彇绫诲瀷-鏈煡*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 7c8fe90..be84009 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -1,10 +1,8 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserAppointmentDto;
-import com.hz.his.dto.user.UserDto;
-import com.hz.his.dto.user.UserIdsDto;
-import com.hz.his.dto.user.UserLevelDto;
+import com.hz.his.dto.coupon.CouponDto;
+import com.hz.his.dto.user.*;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
import com.hz.his.dto.user.coupon.*;
@@ -172,9 +170,10 @@
/**
* 鑾峰彇鐢ㄦ埛鎷ユ湁缁熻
+ * 杩斿洖浣跨敤UserHaveDt
* */
@PostMapping(value = "/user/have/count")
- Result userHaveCount(@RequestParam("userId") String userId);
+ Result userHaveCount(@RequestBody UserHaveDto userHaveDto);
/**
@@ -246,4 +245,13 @@
@PostMapping(value = "/user/sms-find")
Result userSms(@RequestBody UserDto userDto);
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+ * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+ * @param userDto 鍙娇鐢╪ame鍜孋IQ
+ * @return 杞寲浣跨敤UserDt
+ */
+ @PostMapping(value = "/user/crowd/import")
+ Result userCrowdImport(@RequestBody UserDto userDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index e0e353f..4d566b6 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -16,31 +16,31 @@
public interface SPhipOrderService {
/**
- * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his
+ * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his (搴熷純)
*/
@PostMapping(value = "/newSync/order/add")
Result createOrder(@RequestBody OrderCreateDto params);
/**
- * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis (搴熷純)
*/
@PostMapping(value = "/newSync/order/orderUpdate")
Result updateOrderStatus(@RequestBody OrdersTotalDto params);
/**
- * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his (搴熷純)
*/
@PostMapping(value = "/newSync/order/pay")
Result payOrderSuc(@RequestBody OrderPayDto params);
/**
- * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis
+ * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis (搴熷純)
*/
@PostMapping(value = "/newSync/order/refund")
Result refundOrder(@RequestBody OrderRefundDto params);
/**
- * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his
+ * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his (搴熷純)
*/
@PostMapping(value = "/newSync/order/cancel")
Result cancelOrder(@RequestBody OrderRefundDto params);
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java
index 5ee9035..06ddb88 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java
@@ -16,6 +16,8 @@
private String id;
/**瑙勬牸鏍囪瘑*/
private String specId;
+ /**瑙勬牸鍚嶇О*/
+ private String specName;
/**瑙勬牸鍊�*/
private List<SpuSpecValueDt> specValueList;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index 757737e..906cd91 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -67,4 +67,6 @@
private String wechat;
/**閭*/
private String email;
+ /**澶村儚*/
+ private String imgUrl;
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserHaveDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserHaveDt.java
new file mode 100644
index 0000000..8f70551
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserHaveDt.java
@@ -0,0 +1,18 @@
+package com.hz.phis.dt.user;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鐢ㄦ埛鎷ユ湁杩斿洖瀹炰綋*/
+@Data
+public class UserHaveDt {
+ /**浼樻儬鍒告暟閲�*/
+ private Integer couponNum;
+ /**椤圭洰鏁伴噺*/
+ private Integer projectNum;
+ /**鍗￠」鏁伴噺*/
+ private Integer cardNum;
+ /**棰勭害鏁伴噺*/
+ private Integer appointNum;
+}
--
Gitblit v1.8.0