From cf2c77388bbe3ed53712699043fd3cb3014a2ad9 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期一, 19 九月 2022 18:28:32 +0800 Subject: [PATCH] 优化操作 --- phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 7 +++ 2 files changed, 103 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java new file mode 100644 index 0000000..ce6f995 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java @@ -0,0 +1,97 @@ +package com.hz.his.dto.user.money; + + +import lombok.Data; +import lombok.ToString; + +import java.math.BigDecimal; + +/** + * 淇敼鐢ㄦ埛璧勯噾 + * + * @author cjh + */ +@Data +public class UserMoneyUpdateDto { + /**Y - 鐢ㄦ埛Id*/ + private String userId; + /**Y - 璧勯噾绫诲瀷*/ + private int fundType; + + /**Y - 鎿嶄綔浜虹被鍨�*/ + private int operatorType; + /**Y -鎿嶄綔浜篒d*/ + private String operatorId; + + /**Y - 鏉ユ簮骞冲彴缂栫爜*/ + private String originChannel; + /**鏉ユ簮涓婚*/ + private String originSubject; + /**Y - 鎿嶄綔鏂瑰紡*/ + private String operationReason; + + /**Y - 鎿嶄綔閲戦锛堝崟浣嶅厓/绉垎锛�*/ + public String opNumber; + + /**鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿0 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙�*/ + private int opType; + + /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�)*/ + private String commonId; + + /**璁㈠崟id*/ + private String orderId; + /**瀛愬崟璁㈠崟id*/ + private String orderItemId; + + /**澶囨敞*/ + private String remarks; + + /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/ + + /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/ + public static final int OPERATOR_TYPE_USER = 0; + /**鎿嶄綔浜虹被鍨�-鍛樺伐*/ + public static final int OPERATOR_TYPE_EMPLOYEE = 1; + /**鎿嶄綔浜虹被鍨�-绠$悊鍛�*/ + public static final int OPERATOR_TYPE_ADMIN = 2; + /**鎿嶄綔浜虹被鍨�-绯荤粺*/ + public static final int OPERATOR_TYPE_SYSTEM = 3; + + /**鎿嶄綔绫诲瀷-绯荤粺澶勭悊*/ + public static final int OP_TYPE_SYS = 0; + /**鎿嶄綔绫诲瀷-鐢ㄦ埛棰嗗彇*/ + public static final int OP_TYPE_USER_RECEIVE = 1; + + /**璧勯噾绫诲瀷-鍌ㄥ�奸噾*/ + public static final int FUND_TYPE_STORAGE = 0; + /**璧勯噾绫诲瀷-澧炲�奸噾*/ + public static final int FUND_TYPE_INCREMENT = 1; + /**璧勯噾绫诲瀷-绉垎*/ + public static final int FUND_TYPE_INTEGRAL = 2; + /**璧勯噾绫诲瀷-棰勫畾閲�*/ + public static final int FUND_TYPE_DEPOSIT = 3; + + /**鎿嶄綔鏂瑰紡-绯荤粺鎿嶄綔*/ + public static final String OPERATION_REASON_SYS = "systemOperation"; + /**鎿嶄綔鏂瑰紡-鍏呭�兼搷浣�*/ + public static final String OPERATION_REASON_RECHARGE= "recharge"; + /**鎿嶄綔鏂瑰紡-閫�娆炬搷浣�*/ + public static final String OPERATION_REASON_REFUND = "refund"; + /**鎿嶄綔鏂瑰紡-鎶垫墸鎿嶄綔*/ + public static final String OPERATION_REASON_DEDUCTION = "deduction"; + /**鎿嶄綔鏂瑰紡-璐拱鎿嶄綔*/ + public static final String OPERATION_REASON_BUY = "buy"; + /**鎿嶄綔鏂瑰紡-杞璁㈠崟*/ + public static final String OPERATION_REASON_TURNRECHARGE = "turnRecharge"; + /**鎿嶄綔鏂瑰紡-杞璁㈠崟*/ + public static final String OPERATION_REASON_GIFT = "bringNewUserGift"; + /**鎿嶄綔鏂瑰紡-鍗忓晢鎿嶄綔*/ + public static final String OPERATION_REASON_NEGOTIATION = "negotiation"; + /**鎿嶄綔鏂瑰紡-閫�鍥炴搷浣�*/ + public static final String OPERATION_REASON_RETURN = "returnGoods"; + /**鎿嶄綔鏂瑰紡-鎹㈣揣鎿嶄綔*/ + public static final String OPERATION_REASON_CHANGE = "changeGoods"; + /**鎿嶄綔鏂瑰紡-鐢熸棩璧犻��*/ + public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift"; +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java index 634f9a8..a2b5414 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java @@ -2,6 +2,7 @@ import com.hx.resultTool.Result; import com.hz.his.dto.user.money.PhisUserMoneyDto; +import com.hz.his.dto.user.money.UserMoneyUpdateDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -18,6 +19,10 @@ @PostMapping(value = "/user/money/op") Result upUserMoney(@RequestBody PhisUserMoneyDto userMoneyDto); - + /** + * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼 + */ + @PostMapping(value = "/phip/user/money/unclaimed/add") + Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto); } \ No newline at end of file -- Gitblit v1.8.0