From 44b8fb1cec053b99b3dbccd66cd62723c37fb243 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 07 三月 2024 10:49:14 +0800
Subject: [PATCH] 2024-03-07 朱宝民 虚拟卡注册接口、充值方法与微信支付整合、获取水卡列表接口优化
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 227 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 199 insertions(+), 28 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
index bcccdf0..0aed5d4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
@@ -9,7 +9,6 @@
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.pipIrrGlobal.voSe.VoClient;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -40,6 +39,11 @@
public class ClientCtrl {
private final ClientSv clientSv;
+ /**
+ * 鑾峰彇鍐滄埛鍒楄〃
+ * @param vo
+ * @return
+ */
@Operation(summary = "鑾峰緱涓�椤靛啘鎴�", description = "杩斿洖涓�椤靛啘鎴锋暟鎹�")
@ApiResponses(value = {
@ApiResponse(
@@ -61,6 +65,39 @@
}
}
+ /**
+ * 鏍规嵁涓婚敭鑾峰彇涓�涓啘鎴峰璞�
+ * @param id
+ * @return
+ */
+ @Operation(summary = "鑾峰緱涓�涓啘鎴�", description = "杩斿洖涓�涓啘鎴锋暟鎹�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaClient.class))}
+ )
+ })
+ @GetMapping(path = "/getone/{id}")
+ @SsoAop()
+ public BaseResponse<VoClient> getOneClient(@PathVariable("id") Long id){
+ try {
+ VoClient res = clientSv.getOneClient(id);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍐滄埛寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+
+ /**
+ * 娣诲姞涓�涓啘鎴峰璞�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
@Operation(summary = "娣诲姞鍐滄埛璁板綍", description = "娣诲姞鍐滄埛璁板綍")
@ApiResponses(value = {
@ApiResponse(
@@ -73,13 +110,123 @@
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoClient po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> add(@RequestBody @Valid DtoClient po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
// 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
- Long villageId = po.getVillageid();
+ Long villageId = po.getVillageId();
+
+ /**
+ * 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
+ */
+ Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
+ if(map_districts.size() <= 0) {
+ return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
+ }
+
+ String provinceNum = map_districts.get("provinceNum").toString();
+ String cityNum = map_districts.get("cityNum").toString();
+ Long countryId = Long.parseLong(map_districts.get("countryId").toString());
+ String countyNum = map_districts.get("countyNum").toString();
+ String countryName = map_districts.get("countryName").toString();
+ Long townId = Long.parseLong(map_districts.get("townId").toString());
+ String townNum = map_districts.get("townNum").toString();
+ String townName = map_districts.get("townName").toString();
+ String villageNum = map_districts.get("villageNum").toString();
+ String villageName = map_districts.get("villageName").toString();
+
+ // 鐢熸垚8浣嶈鏀垮尯鍒掔紪鐮侊紝鐢熸垚鍐滄埛缂栧彿鐢�
+ String district8 = countyNum + townNum + villageNum;
+ // 鐢熸垚鍐滄埛缂栧彿
+ String clientNum = generateClientNum(district8);
+ // 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
+ Long districtNum = Long.parseLong(provinceNum + cityNum + district8);
+ String districtTitle = countryName + townName + villageName;
+
+ // 鐢熸垚铏氭嫙鍗″彿
+ Long virtualId = Optional.ofNullable(clientSv.getMa1xVirtualId()).orElse(0L);
+ if(virtualId == 0) {
+ virtualId = 1000000000L;
+ }else {
+ virtualId = virtualId + 1;
+ if(virtualId > 10000000000L) {
+ return BaseResponseUtils.buildFail("铏氭嫙鍗″彿瓒呴檺");
+ }
+ }
+
+ SeClient seClient = DtoClientToSeClient.INSTANCT.po2vo(po);
+ seClient.setCountyid(countryId);
+ seClient.setTownid(townId);
+ seClient.setVirtualid(virtualId);
+ seClient.setClientnum(clientNum);
+ seClient.setDistrictnum(districtNum);
+ seClient.setDistricttitle(districtTitle);
+ Date operateTime = new Date();
+ seClient.setOperatedt(operateTime);
+
+ seClient.setDisabled((byte)0);
+ seClient.setDeleted((byte)0);
+ Integer rec = Optional.ofNullable(clientSv.addClient(seClient)).orElse(0);
+ if(rec == 0) {
+ return BaseResponseUtils.buildFail("娣诲姞鍐滄埛澶辫触");
+ }
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ /**
+ * 鐢熸垚10浣嶅啘鎴风紪鍙�
+ * 1. 鍒板啘鎴疯〃涓煡璇�6浣嶅尯鍒掍覆寮�澶寸殑鏈�澶х殑鍐滄埛缂栧彿
+ * 2. 鏄惁鍙栧埌璁板綍
+ * 2.1 鍙栧埌
+ * 2.1.1 鍙栧嚭鍚�4浣嶉『搴忓彿骞惰浆鎴愭暣褰�
+ * 2.1.2. 鏁村舰鏍煎紡鐨勯『搴忓彿鍔�1骞跺垽鏂槸鍚﹀ぇ浜�9999
+ * 2.1.2.1 濡傛灉澶т簬鍒欐彁绀虹敤鎴风紪鍙峰凡婊�
+ * 2.1.2.2 濡傛灉涓嶅ぇ 6浣嶅尯鍒掑姞涓婃牸寮忓寲鍚庣殑椤哄簭鍙�
+ * 2.2 鏈彇鍒� 6浣嶅尯鍒掑姞涓�0001
+ * 3. 杩斿洖鍐滄埛缂栧彿
+ */
+ private String generateClientNum(String district8) {
+ String clientNum = Optional.ofNullable(clientSv.getClientNumOfMax(district8)).orElse("");
+ if(clientNum != null && clientNum.trim().length() > 0) {
+ Integer number = Integer.parseInt(clientNum.substring(8));
+ number = number + 1;
+ if(number > 9999) {
+ return "鍐滄埛缂栧彿瓒呴檺";
+ }
+ clientNum = clientNum.substring(0, 8) + String.format("%04d", number);
+ } else {
+ clientNum = district8 + "0001";
+ }
+ return clientNum;
+ }
+
+ /**
+ * 淇敼鍐滄埛瀵硅薄锛堣櫄鎷熷崱鍙枫�佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀癸級
+ * @param po 鍐滄埛瀵硅薄
+ * @param bindingResult
+ * @return
+ */
+ @Operation(summary = "淇敼鍐滄埛璁板綍", description = "淇敼鍐滄埛璁板綍")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> update(@RequestBody @Valid DtoClient po, BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ // 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
+ Long villageId = po.getVillageId();
/**
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
@@ -117,40 +264,64 @@
Date operateTime = new Date();
seClient.setOperatedt(operateTime);
- seClient.setDisabled((byte)0);
- seClient.setDeleted((byte)0);
- Integer rec = Optional.ofNullable(clientSv.addClient(seClient)).orElse(0);
+ Integer rec = Optional.ofNullable(clientSv.updateByPrimaryKey(seClient)).orElse(0);
if(rec == 0) {
- return BaseResponseUtils.buildFail("娣诲姞鍐滄埛澶辫触");
+ return BaseResponseUtils.buildFail("鍐滄埛淇敼澶辫触");
}
return BaseResponseUtils.buildSuccess(true) ;
}
/**
- * 鐢熸垚10涓哄啘鎴风紪鍙�
- * 1. 鍒板啘鎴疯〃涓煡璇�6浣嶅尯鍒掍覆寮�澶寸殑鏈�澶х殑鍐滄埛缂栧彿
- * 2. 鏄惁鍙栧埌璁板綍
- * 2.1 鍙栧埌
- * 2.1.1 鍙栧嚭鍚�4浣嶉『搴忓彿骞惰浆鎴愭暣褰�
- * 2.1.2. 鏁村舰鏍煎紡鐨勯『搴忓彿鍔�1骞跺垽鏂槸鍚﹀ぇ浜�9999
- * 2.1.2.1 濡傛灉澶т簬鍒欐彁绀虹敤鎴风紪鍙峰凡婊�
- * 2.1.2.2 濡傛灉涓嶅ぇ 6浣嶅尯鍒掑姞涓婃牸寮忓寲鍚庣殑椤哄簭鍙�
- * 2.2 鏈彇鍒� 6浣嶅尯鍒掑姞涓�0001
- * 3. 杩斿洖鍐滄埛缂栧彿
+ * 鏍规嵁鍐滄埛ID閫昏緫鍒犻櫎鍐滄埛
+ * @param id
+ * @return
*/
- private String generateClientNum(String district8) {
- String clientNum = Optional.ofNullable(clientSv.getClientNumOfMax(district8)).orElse("");
- if(clientNum != null && clientNum.trim().length() > 0) {
- Integer number = Integer.parseInt(clientNum.substring(8));
- number = number + 1;
- if(number > 9999) {
- return "鍐滄埛缂栧彿瓒呴檺";
+ @Operation(summary = "鍒犻櫎涓�涓啘鎴�", description = "鍒犻櫎涓�涓啘鎴锋暟鎹�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaClient.class))}
+ )
+ })
+
+ @GetMapping(path = "/delone/{id}")
+ @SsoAop()
+ public BaseResponse<Boolean> deleteClientById(@PathVariable("id") Long id){
+ try {
+ Integer res = Optional.ofNullable(clientSv.deleteClientById(id)).orElse(0);
+ if(res == 0) {
+ return BaseResponseUtils.buildFail("鍐滄埛鍒犻櫎澶辫触");
}
- clientNum = clientNum.substring(0, 8) + String.format("%04d", number);
- } else {
- clientNum = district8 + "0001";
+ return BaseResponseUtils.buildSuccess(true);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍐滄埛寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
}
- return clientNum;
}
+ /**
+ * 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
+ * @param
+ * @return
+ */
+ @Operation(summary = "鑾峰緱鐢ㄦ按鏂瑰紡鍒楄〃", description = "杩斿洖鐢ㄦ按鏂瑰紡鍒楄〃")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = BaClient.class))}
+ )
+ })
+ @GetMapping(path = "/watertypes")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getWaterTypes(){
+ List<Map<String, Object>> map_WaterTypes = Optional.ofNullable(clientSv.getWaterTypes()).orElse(new ArrayList<>());
+ if(map_WaterTypes == null || map_WaterTypes.size() == 0) {
+ return BaseResponseUtils.buildFail("娌℃湁鐢ㄦ按鏂瑰紡") ;
+ }
+ return BaseResponseUtils.buildSuccess(map_WaterTypes);
+ }
}
--
Gitblit v1.8.0