From 7d26479c1ede1035b7aabc6e61676c69b9438a64 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期二, 25 十月 2022 12:02:51 +0800 Subject: [PATCH] 订单详情转换实体 --- phis-feign/src/main/java/com/hz/phis/dt/order/OrderInfoDt.java | 50 ++++++ phis-feign/src/main/java/com/hz/phis/dt/order/OrderRefundDt.java | 33 ++++ phis-feign/src/main/java/com/hz/phis/dt/order/OrderPayRecordDt.java | 52 ++++++ phis-feign/src/main/java/com/hz/phis/dt/order/OrderItemSonDt.java | 56 +++++++ phis-feign/src/main/java/com/hz/phis/dt/order/OrderDetailDt.java | 22 ++ phis-feign/src/main/java/com/hz/phis/dt/order/OrderTotalDt.java | 132 ++++++++++++++++ phis-feign/src/main/java/com/hz/phis/dt/order/OrderItemDt.java | 87 ++++++++++ phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java | 1 8 files changed, 433 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java index 3db0288..75c960b 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java @@ -21,6 +21,7 @@ /** * 璁㈠崟璇︽儏 + * 杞崲鐢∣rderDetailDt */ @PostMapping(value = "/order/detail") Result orderDetail(@RequestParam("orderId") String orderId); diff --git a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderDetailDt.java b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderDetailDt.java new file mode 100644 index 0000000..fa43e64 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderDetailDt.java @@ -0,0 +1,22 @@ +package com.hz.phis.dt.order; + +import lombok.Data; + +import java.util.List; + +/** + * 璁㈠崟璇︽儏杞寲瀹炰綋 + */ +@Data +public class OrderDetailDt{ + /**鎬昏鍗�*/ + private OrderTotalDt ordersTotal; + /**瀛愯鍗�*/ + private List<OrderItemDt> orderItemList; + /**鏀粯璁板綍*/ + private List<OrderPayRecordDt> payRecord; + /**閫�娆捐褰�*/ + private List<OrderRefundDt> refundRecord; + /**璇︾粏淇℃伅*/ + private OrderInfoDt infoList; +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderInfoDt.java b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderInfoDt.java new file mode 100644 index 0000000..6fe3715 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderInfoDt.java @@ -0,0 +1,50 @@ +package com.hz.phis.dt.order; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 璁㈠崟鍏跺畠淇℃伅杞寲瀹炰綋 + */ +@Data +public class OrderInfoDt { + /**璁㈠崟id*/ + private String orderId; + /**鏀粯娴佹按(绗笁鏂规敮浠樻祦姘村彿)*/ + private String payNo; + /**璐拱鏁伴噺*/ + private Integer buyNum; + /**娲诲姩瑙勫垯鏍囪瘑*/ + private String activityId; + /**娲诲姩瑙勫垯鍚嶇О*/ + private String activityName; + /**鏄惁鏁村崟鎶樻墸*/ + private Integer isWholeDiscount; + /**鏄惁鍛樺伐鎶樻墸*/ + private Integer isEmployeeDiscount; + /**鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100)*/ + private BigDecimal discount; + /**鍒掓墸鐜伴噾鎬婚噾棰�(浣滅敤:鐢ㄦ潵璁$畻鍒掓墸椤圭洰鐨勬墽琛岄噾棰�,鏀粯鏂瑰紡鏄幇閲戞敮浠樼殑鎬婚噾棰�)*/ + private BigDecimal snapPayTotal; + /**棰嗗缓璁㈠崟鍙�*/ + private String hisOrderNo; + /**鐢ㄦ埛鎺ㄨ崘浜�/鐢ㄦ埛閭�璇蜂汉鏍囪瘑*/ + private String inviteeId; + /**鐢ㄦ埛鎺ㄨ崘浜�/鐢ㄦ埛閭�璇蜂汉鍚嶇О*/ + private String inviteeName; + /**鐢ㄦ埛娓犻亾鏍囪瘑,椤剁骇*/ + private String channelId; + /**鐢ㄦ埛娓犻亾鍚嶇О,椤剁骇*/ + private String channelName; + /**鐢ㄦ埛浜岀骇娓犻亾鏍囪瘑,鏈骇*/ + private String channel2Id; + /**鐢ㄦ埛浜岀骇娓犻亾鍚嶇О,鏈骇*/ + private String channelName2; + /**鐢ㄦ埛娓犻亾鏉ユ簮绫诲瀷(UserChannelType)*/ + private String channelCategory; + /**鏄惁鏄�佸甫鏂�(0:鍚︼紝1:鏄�)*/ + private Integer isOldBringNew; + /**鏄惁瀹㈡埛纭(0:鍚︼紝1:鏄�)*/ + private Integer isCustomerConfirm; +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderItemDt.java b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderItemDt.java new file mode 100644 index 0000000..3624821 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderItemDt.java @@ -0,0 +1,87 @@ +package com.hz.phis.dt.order; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 涓�绾ц鍗曡鎯呰浆鍖栧疄浣� + */ +@Data +public class OrderItemDt { + /**璁㈠崟缂栧彿*/ + private String orderNo; + /**鍟嗗搧绫诲瀷(OrderItemConstants)*/ + private String type; + /**椤圭洰缂栧彿/鍟嗗搧缂栫爜/濂楅缂栫爜/鍏朵粬缂栫爜*/ + private String goodsNo; + /**鍚嶇О*/ + private String goodsName; + /**鍥剧墖*/ + private String goodsImage; + /**瑙勬牸锛屽啑浣欏瓧娈碉紙鏍煎紡锛歔{'specsId':鈥樿鏍兼爣璇嗏��,'specsTitle':'瑙勬牸鍚嶇О,'specsValue':'瑙勬牸鍊�','unit':'鍗曚綅'}]锛�*/ + private String specs = "[]"; + /**韬綋閮ㄤ綅鏍囪瘑*/ + private String bodyPartsId; + /**韬綋閮ㄤ綅鍚嶇О*/ + private String bodyPartsName; + /**鏀粯鐘舵��*/ + private Integer payStatus; + /**閫�娆剧姸鎬�*/ + private Integer refundStatus; + /**璁㈠崟鎬婚噾棰�*/ + private BigDecimal total; + /**瀹炰粯閲戦*/ + private BigDecimal actualTotal; + /**鐢ㄦ埛宸叉敮浠樻�婚噾棰�*/ + private BigDecimal userPaidTotal; + /**璁㈠崟鎬荤Н鍒�*/ + private BigDecimal totalPoints=BigDecimal.ZERO; + /**搴斾粯鎬荤Н鍒�*/ + private BigDecimal shouldTotalPoints=BigDecimal.ZERO; + /**宸叉敮浠樻�荤Н鍒�*/ + private BigDecimal actualTotalPoints=BigDecimal.ZERO; + /**鍘熶环*/ + private BigDecimal oriPrice; + /**鐜颁环*/ + private BigDecimal curPrice; + /**椤圭洰/鍟嗗搧鐤楃▼鍗曟鏁�(鐤楃▼娆℃暟)*/ + private Integer single; + /**鎶樻墸(鍗曚綅:鐧惧垎姣�)*/ + private BigDecimal discount; + /**鎬绘鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛�*/ + private Integer usedTotal; + /**璐拱鏁伴噺*/ + private Integer buyNum; + /**瀛愰」璁㈠崟澶囨敞*/ + private String remarks; + /**椤圭洰id/鍟嗗搧id/濂楅鏍囪瘑/鍏朵粬鏍囪瘑锛堝叕鐢ㄦ爣璇嗭級*/ + private String commonId; + /**鎵ц鏉$洰ID*/ + private String performId; + /**璁㈠崟id锛圤rdersTotal锛�*/ + private String orderId; + /**鍗″寘鏍囪瘑锛圲serCard锛�*/ + private String userCardId; + /**杞叆闂ㄥ簵id*/ + private String transferIntoShopId; + /**杞叆闂ㄥ簵鍚嶇О*/ + private String transferIntoShopName; + /**鏄惁杞枟*/ + private Integer isTransfer; + /**鏄惁杞禒*/ + private Integer isTurn; + /**骞冲彴绫诲瀷*/ + private String platformType; + /**骞冲彴绫诲瀷鍏宠仈鍟嗗搧id*/ + private String platformTypeId; + /**绗笁鏂筰tem鏍囪瘑(璇ュ瓧娈靛钩鍙扮被鍨嬫牴鎹產ppIdCode鍒ゆ柇)*/ + private String commonItemId; + /**鏄惁闄愯喘*/ + private Integer isLimitBug; + /**鏄惁SPA(0:鍚�,1:鏄�)*/ + private Integer isSpa; + /**瀛愮骇*/ + private List<OrderItemSonDt> itemSonList; +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderItemSonDt.java b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderItemSonDt.java new file mode 100644 index 0000000..5553781 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderItemSonDt.java @@ -0,0 +1,56 @@ +package com.hz.phis.dt.order; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 浜岀骇瀛愯鍗曡鎯呰浆鍖栧疄浣� + */ +@Data +public class OrderItemSonDt { + /**鍟嗗搧绫诲瀷(OrderGoodsConstants)*/ + private String type; + /**椤圭洰缂栧彿/鍟嗗搧缂栫爜/濂楅缂栫爜/鍏朵粬缂栫爜*/ + private String goodsNo; + /**鍚嶇О*/ + private String goodsName; + /**鍥剧墖*/ + private String goodsImage; + /**瑙勬牸锛屽啑浣欏瓧娈碉紙鏍煎紡锛歔{'specsId':鈥樿鏍兼爣璇嗏��,'specsTitle':'瑙勬牸鍚嶇О,'specsValue':'瑙勬牸鍊�','unit':'鍗曚綅'}]锛�*/ + private String specs = "[]"; + /**韬綋閮ㄤ綅鏍囪瘑*/ + private String bodyPartsId; + /**韬綋閮ㄤ綅鍚嶇О*/ + private String bodyPartsName; + /**璁㈠崟鎬婚噾棰�*/ + private BigDecimal total; + /**瀹炰粯閲戦*/ + private BigDecimal actualTotal; + /**鍘熶环*/ + private BigDecimal oriPrice; + /**鐜颁环*/ + private BigDecimal curPrice; + /**鎬绘鏁�*/ + private Integer usedTotal; + /**鍗曟鏁帮紙鐤楃▼娆℃暟锛岄粯璁や负0锛�*/ + private Integer usedOne; + /**璐拱鏁伴噺*/ + private Integer buyNum; + /**椤圭洰id/鍟嗗搧id锛堝叕鐢ㄦ爣璇嗭級*/ + private String goodsId; + /**鎵ц鏉$洰ID*/ + private String performId; + /**璁㈠崟id锛圤rdersTotal锛�*/ + private String orderId; + /**涓�绾у瓙璁㈠崟id锛圤rderItem锛�*/ + private String orderItemId; + /**鍗¢」鏉冪泭鏍囪瘑(CardEquity)*/ + private String cardEquityId; + /**鍗¢」鏍囪瘑(CardItemInfo)*/ + private String cardItemInfoId; + /**鏄惁鏄崱鍖呯姸鎬�*/ + private Integer isCardBag; + /**鏄惁SPA(0:鍚�,1:鏄�)*/ + private Integer isSpa; +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderPayRecordDt.java b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderPayRecordDt.java new file mode 100644 index 0000000..58ec746 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderPayRecordDt.java @@ -0,0 +1,52 @@ +package com.hz.phis.dt.order; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 璁㈠崟鏀粯璁板綍璇︽儏杞寲瀹炰綋 + */ +@Data +public class OrderPayRecordDt { + /**鐘舵�侊紙RecordConsumeConstants锛�*/ + private Integer status; + /**鎬婚噾棰�*/ + private BigDecimal consumeTotal; + /**瀹炰粯閲戦*/ + private BigDecimal consumeMoney; + /**鏀粯-鎬婚噾棰�*/ + private BigDecimal payMoney; + /**鏀粯-绗笁鏂归噾棰�*/ + private BigDecimal thirdPartyFund; + /**鏀粯-鍌ㄥ�奸噾*/ + private BigDecimal storedFund; + /**鏀粯-澧炲�奸噾*/ + private BigDecimal incrementFund; + /**閫�娆�-鎬婚噾棰�*/ + private BigDecimal refundTotal; + /**閫�娆�-绗笁鏂归噾棰�*/ + private BigDecimal thirdPartyRefund; + /**閫�娆�-鍌ㄥ�奸噾*/ + private BigDecimal storedRefund; + /**閫�娆�-澧炲�奸噾*/ + private BigDecimal incrementRefund; + /**澶囨敞*/ + private String remarks ; + /**娑堣垂闂ㄥ簵鏍囪瘑*/ + private String shopId; + /**娑堣垂闂ㄥ簵鍚嶇О*/ + private String shopName; + /**璁㈠崟鍙�*/ + private String orderNo; + /**涓嬪崟鏃堕棿/娌℃湁璁㈠崟榛樿褰撳墠鏃堕棿*/ + private Date orderTime; + /**璁㈠崟绫诲瀷锛堝叕鐢級锛圧ecordConsumeConstants锛�*/ + private Integer commonType; + /**璁㈠崟id锛堝叕鐢級*/ + private String commonId; + /**鐢ㄦ埛id*/ + private String userId; + +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderRefundDt.java b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderRefundDt.java new file mode 100644 index 0000000..373d3b1 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderRefundDt.java @@ -0,0 +1,33 @@ +package com.hz.phis.dt.order; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 璁㈠崟閫�娆捐褰曡浆鍖栧疄浣� + */ +@Data +public class OrderRefundDt { + + /**缂栧彿*/ + private String code; + /**閫�娆鹃棬搴梚d*/ + private String refundShopId; + /**閫�娆鹃棬搴楀悕绉�*/ + private String refundShopName; + /**閫�娆炬�婚噾棰�*/ + private BigDecimal refundTotal; + /**閫�娆剧姸鎬� (RefundStatus)*/ + private Integer refundStatus; + /**閫�娆剧被鍨�(0:閫�娆℃暟閫�娆�,1:浠呴��娆� 榛樿:0)*/ + private Integer refundType; + /**鏉ユ簮绫诲瀷 (RefundSoruceConstants)*/ + private String sourceType; + /**璁㈠崟澶囨敞*/ + private String remarks; + /**鎬昏鍗昳d(OrdersTotal)*/ + private String orderId; + /**鐢ㄦ埛id*/ + private String userId; +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/order/OrderTotalDt.java b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderTotalDt.java new file mode 100644 index 0000000..4691096 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/order/OrderTotalDt.java @@ -0,0 +1,132 @@ +package com.hz.phis.dt.order; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 鎬昏鍗曡浆鍖栧疄浣� + */ +@Data +public class OrderTotalDt { + /**璁㈠崟缂栧彿*/ + private String orderNo; + /**璁㈠崟绫诲瀷*/ + private String type; + /**鐘舵��*/ + private Integer status; + /**鏀粯鐘舵��*/ + private Integer payStatus; + /**鏀粯鏃堕棿*/ + private Date payTime; + /**閫�娆剧姸鎬�*/ + private Integer refundStatus; + /**鍙栨秷鏃堕棿/浣滃簾鏃堕棿*/ + private Date cancelTime; + /**璁㈠崟鎬婚噾棰濓紝浠ュ厓涓哄瓨鍌紙鍏ㄩ儴閲戦,鍖呮嫭浼樻儬浠锋牸锛�*/ + private BigDecimal total; + /**搴斾粯鎬婚噾棰濓紝浠ュ厓涓哄瓨鍌紙payTotal+鍏朵粬鏀粯妯″紡锛�*/ + private BigDecimal shouldTotal; + /**搴斾粯鎬婚噾棰濓紝浠ュ厓涓哄瓨鍌紙payTotal+鍏朵粬鏀粯妯″紡锛�*/ + private BigDecimal actualTotal; + /**璁㈠崟鎬荤Н鍒�*/ + private BigDecimal totalPoints=BigDecimal.ZERO; + /**搴斾粯鎬荤Н鍒�*/ + private BigDecimal shouldTotalPoints=BigDecimal.ZERO; + /**宸叉敮浠樻�荤Н鍒�*/ + private BigDecimal actualTotalPoints=BigDecimal.ZERO; + /**宸叉敮浠樼幇閲戦噾棰濓紙寰俊/鏀粯瀹濇敮浠�/鍏朵粬锛夛紝浠ュ厓涓哄瓨鍌�*/ + private BigDecimal payTotal; + /**宸叉敮浠樺偍鍊奸噾閲戦*/ + private BigDecimal payRecharge; + /**宸叉敮浠樺鍊奸噾閲戦*/ + private BigDecimal payIncrement; + /**浼樻儬閲戦*/ + private BigDecimal discountTotal; + /**娲诲姩瑙勫垯浼樻儬鎬婚噾棰�*/ + private BigDecimal activityTotal; + /**璧犻�侀噾棰�*/ + private BigDecimal givingAmount; + /**璧犻�侀噾棰濈被鍨�*/ + private String givingType; + /**鎵�灞為棬搴楁爣璇�*/ + private String shopId; + /**鎵�灞為棬搴楀悕绉�*/ + private String shopName; + /**鎿嶄綔绫诲瀷*/ + private Integer operatorType; + /**涓嬪崟鎿嶄綔浜烘爣璇�*/ + private String operatorId; + /**涓嬪崟鎿嶄綔浜哄悕绉�*/ + private String operatorName; + /**寮�鍙戜汉闂ㄥ簵鏍囪瘑*/ + private String developerShopId; + /**寮�鍙戜汉闂ㄥ簵鍚嶇О*/ + private String developerShopName; + /**寮�鍙戜汉鏍囪瘑*/ + private String developerId; + /**寮�鍙戜汉鍚嶇О*/ + private String developerName; + /**骞冲彴鏉ユ簮appId*/ + private String appId; + /**鏉ユ簮搴旂敤缂栫爜*/ + private String appIdCode; + /**閿�鍞鍗曟潵婧�*/ + private String sourceCode; + private String sourceName; + /**绗笁鏂硅鍗曞彿*/ + private String sourceOrderNo; + /**鍏戞崲鐮�*/ + private String conversionCode; + /**璁㈠崟娓犻亾鏉ユ簮绫诲瀷*/ + private String channelType; + /**璁㈠崟娓犻亾鏍囪瘑*/ + private String commonId; + /**璁㈠崟娓犻亾鏉ユ簮鍚嶇О*/ + private String commonName; + /**绉戝缂栫爜*/ + private String departmentCode; + /**绉戝鍚嶇О*/ + private String departmentName; + /**缇庡甯堟爣璇�*/ + private String beauticianId; + /**缇庡甯堝悕绉�*/ + private String beauticianName; + /**鍖荤敓鏍囪瘑*/ + private String doctorId; + /**鍖荤敓鍚嶇О*/ + private String doctorName; + /**鍚屾鐘舵��0鍚�1鏄�*/ + private int hisSynStatus; + /**鍚屾his璁㈠崟鍙�*/ + private String hisOrderId; + /**棰勭害璁㈠崟鏍囪瘑*/ + private String appointmentId; + /**鍓╀綑鍌ㄥ�奸噾,浠ュ厓淇濈暀2浣嶅皬鏁颁负鍗曚綅瀛樺偍鍔犲瘑鍚庣殑瀛楃涓�*/ + private String storedValueFund; + /**鍓╀綑澧炲�奸噾,浠ュ厓淇濈暀2浣嶅皬鏁颁负鍗曚綅瀛樺偍鍔犲瘑鍚庣殑瀛楃涓�*/ + private String valueAddedFund; + /**鍓╀綑绉垎,浠ュ厓淇濈暀2浣嶅皬鏁颁负鍗曚綅瀛樺偍鍔犲瘑鍚庣殑瀛楃涓�*/ + private String integral; + /**浼氬憳绛夌骇*/ + private String userLevel; + /**CIQ*/ + private String CIQ; + /**璁㈠崟澶囨敞*/ + private String remarks; + /**璁㈠崟鎺ㄨ崘浜烘爣璇�*/ + private String inviteeId; + /**璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑)*/ + private String inviteeName; + /**璁㈠崟鎺ㄨ崘浜烘墍灞炵被鍨�*/ + private String userBelongingType; + /**鐢ㄦ埛Id*/ + private String userId; + /**鍚屾his鐘舵�� 濡傛灉鏄�0鍚屾涓帴涓嬫潵鐨勬搷浣滃氨涓嶈鎵ц*/ + private Integer syncStatus; + /**搴峰崥浣虫爣璇�(KoapOrderTotal)*/ + private String koapOrderId; + /**鏄惁鍚屾璁㈠崟*/ + private Integer isSyncOrder; +} -- Gitblit v1.8.0