From 86bba1b6323d5ae0340371ebfb0bc91271068c7e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 12 十一月 2024 15:37:07 +0800
Subject: [PATCH] 获取巡检员问题上报记录接口
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 116 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 33 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
index d04a1e2..2121d22 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -5,18 +5,20 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper;
import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
-import com.dy.pipIrrGlobal.voBa.VoAreaCode;
+import com.dy.pipIrrGlobal.util.Constant;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
+import com.dy.pipIrrSell.cardOperate.enums.OperateTypeENUM;
import com.dy.pipIrrSell.clientCard.CardStateENUM;
import com.dy.pipIrrSell.clientCard.ClientCardSv;
import com.dy.pipIrrSell.clientCard.LastOperateENUM;
import com.dy.pipIrrSell.recharge.DtoRecharge;
import com.dy.pipIrrSell.recharge.RechargeCtrl;
+import com.dy.pipIrrSell.recharge.RechargeSv;
import com.dy.pipIrrSell.result.SellResultCode;
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;
@@ -48,7 +50,18 @@
private final ActiveCardSv activeCardSv;
private final ClientCardSv clientCardSv;
private final RechargeCtrl rechargeCtrl;
+ private final RechargeSv rechargeSv;
+ private final BaSettingsMapper baSettingsMapper;
+
+ //@Value("${projectCode.ym}")
+ //private Integer projectCode;
+
+ /**
+ * 鑾峰彇寮�鍗¤褰�
+ * @param vo
+ * @return
+ */
@Operation(summary = "鑾峰緱涓�椤靛紑鍗¤褰�", description = "杩斿洖涓�椤靛紑鍗℃暟鎹�")
@ApiResponses(value = {
@ApiResponse(
@@ -58,9 +71,9 @@
schema = @Schema(implementation = VoActiveCard.class))}
)
})
- @GetMapping(path = "/getActiveCards", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
- public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ @GetMapping(path = "/getActiveCards")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(QueryVo vo){
try {
QueryResultVo<List<VoActiveCard>> res = activeCardSv.getActiveCards(vo);
return BaseResponseUtils.buildSuccess(res);
@@ -70,6 +83,12 @@
}
}
+ /**
+ * 寮�鍗℃搷浣�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
@Operation(summary = "寮�鍗�", description = "鏂板紑鍐滄埛鍗�")
@ApiResponses(value = {
@ApiResponse(
@@ -81,8 +100,8 @@
})
@PostMapping(path = "add_active", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> add_active(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
+ @SsoAop()
+ public BaseResponse<Boolean> add_active(@RequestBody @Valid DtoActiveCard po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -95,16 +114,18 @@
* townId 闀囩骇鍖哄垝浠ｇ爜
* villageId 鏉戠骇鍖哄垝浠ｇ爜
*/
- VoAreaCode voAreaCode = activeCardSv.getAreaCodeByNum(po.getClientNum());
- if(voAreaCode == null) {
- return BaseResponseUtils.buildFail(SellResultCode.AREA_CODE_MISTAKE.getMessage());
- }
- String provinceId = voAreaCode.getProvinceId();
- String cityId = voAreaCode.getCityId();
- String countryId = voAreaCode.getCountryId();
- String townId = voAreaCode.getTownId();
- String villageId = voAreaCode.getVillageId();
- String areaCode = provinceId + cityId + countryId + townId + villageId;
+ //VoAreaCode voAreaCode = activeCardSv.getAreaCodeByNum(po.getClientNum());
+ //if(voAreaCode == null) {
+ // return BaseResponseUtils.buildFail(SellResultCode.AREA_CODE_MISTAKE.getMessage());
+ //}
+ //String provinceId = voAreaCode.getProvinceId();
+ //String cityId = voAreaCode.getCityId();
+ //String countryId = voAreaCode.getCountryId();
+ //String townId = voAreaCode.getTownId();
+ //String villageId = voAreaCode.getVillageId();
+ //String areaCode = provinceId + cityId + countryId + townId + villageId;
+
+ String areaCode = String.valueOf(activeCardSv.getAreaCodeByNum(po.getClientNum()));
/**
* 鏍规嵁琛屾斂鍖哄垝涓诧紙areaCode锛夊湪姘村崱琛ㄤ腑閽堝姘村崱缂栧彿锛坈ardNum锛夎繘琛屾ā绯婃煡璇�
@@ -138,6 +159,8 @@
*/
String cardAddr = po.getCardAddr();
String clientNum = po.getClientNum();
+ //Long clientId = po.getClientId();
+
Integer cardCost = po.getCardCost();
Float amount = po.getAmount();
Long paymentId = po.getPaymentId();
@@ -146,13 +169,19 @@
Date createTime = new Date();
/**
+ * 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID
+ */
+ Long clientId = activeCardSv.getClientIdByNum(clientNum);
+
+ /**
* 娣诲姞鍐滄埛鍗¤褰�
*/
SeClientCard seClientCard = new SeClientCard();
seClientCard.setCardaddr(cardAddr);
seClientCard.setCardnum(cardNum);
- seClientCard.setClientnum(clientNum);
- seClientCard.setMoney(0.0);
+ //seClientCard.setClientnum(clientNum);
+ seClientCard.setClientid(clientId);
+ seClientCard.setMoney(0f);
seClientCard.setState(CardStateENUM.NORMAL.getCode());
seClientCard.setCreatedt(createTime);
seClientCard.setLastoper(LastOperateENUM.ACTIVE.getCode());
@@ -166,8 +195,11 @@
* 娣诲姞寮�鍗¤褰�
*/
SeActiveCard activeCard = new SeActiveCard();
- activeCard.setCardnum(cardNum);
- activeCard.setClientnum(clientNum);
+ //activeCard.setCardnum(cardNum);
+ //activeCard.setClientnum(clientNum);
+
+ activeCard.setCardid(cardId);
+ activeCard.setClientid(clientId);
activeCard.setCardcost(cardCost);
activeCard.setPaymentid(paymentId);
activeCard.setOperatetype(OperateTypeENUM.ACTIVE.getCode());
@@ -182,8 +214,9 @@
/**
* 濡傛灉鎿嶄綔浜哄憳寮�鍗℃椂杈撳叆浜嗗厖鍊奸噾棰濓紝鍒欏紑鍗″悗璋冪敤鍏呭�煎姛鑳�
*/
- po.setCardNum(cardNum);
+ po.setCardNum(Long.parseLong(cardNum));
if(amount != null && amount > 0) {
+ po.setClientId(clientId);
DtoRecharge dtoRecharge = RechargeDtoMapper.INSTANCT.po2vo(po);
dtoRecharge.setMoney(0f);
dtoRecharge.setGift(0f);
@@ -194,7 +227,19 @@
}
}
- return BaseResponseUtils.buildSuccess(cardNum) ;
+ Map map = new HashMap();
+ if(amount != null && amount > 0) {
+ Long rechargeId = rechargeSv.selectIdByCardId(cardId);
+ map.put("orderNumber",rechargeId+"");//杩斿洖鍏呭�糏D
+ }else {
+ map.put("orderNumber",rec+"");//杩斿洖寮�鍗D
+ }
+ String projectNo = baSettingsMapper.getItemValue("projectNo");
+ Integer projectNo1 = Integer.valueOf(projectNo);
+ String projectNo3 = String.format("%02x", projectNo1);
+ map.put("projectNo", projectNo3);
+ map.put("cardNum", cardNum);
+ return BaseResponseUtils.buildSuccess(map) ;
}
@Operation(summary = "琛ュ崱", description = "琛ュ崱")
@@ -208,8 +253,8 @@
})
@PostMapping(path = "add_reissue", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> add_reissue(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
+ @SsoAop()
+ public BaseResponse<Boolean> add_reissue(@RequestBody @Valid DtoActiveCard po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -217,7 +262,8 @@
/**
* cardId 姘村崱缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾洿鏂版按鍗¤〃鐢級
* cardNum 姘村崱缂栧彿
- * clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犺ˉ鍗′娇鐢級
+ //* clientNum 鍐滄埛缂栧彿锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犺ˉ鍗′娇鐢級
+ * clientId 鍐滄埛ID锛堥潪浼犲叆鍙傛暟锛岀敱cardNum鍙嶆煡锛屾坊鍔犺ˉ鍗′娇鐢級
* cardCost 鍗＄墖璐圭敤
* reissueAmount 琛ュ崱閲戦锛岃ˉ鍗℃椂浣跨敤
* paymentId 鏀粯鏂瑰紡缂栧彿
@@ -226,10 +272,11 @@
* activeTime 琛ュ崱鏃堕棿
*/
Long cardId = 0L;
- String cardNum = po.getCardNum();
- String clientNum = "";
+ Long cardNum = po.getCardNum();
+ //String clientNum = "";
+ Long clientId = 0L;
Integer cardCost = po.getCardCost();
- Double reissueAmount = po.getReissueAmount();
+ Float reissueAmount = po.getReissueAmount();
Long paymentId = po.getPaymentId();
String remarks = po.getRemarks();
Long operator = po.getOperator();
@@ -243,7 +290,8 @@
return BaseResponseUtils.buildFail(SellResultCode.CARD_NUMBER_ERROR.getMessage());
}
cardId = Long.parseLong(map.get("cardId").toString());
- clientNum = map.get("clientNum").toString();
+ //clientNum = map.get("clientNum").toString();
+ clientId = Long.parseLong(map.get("clientId").toString());
/**
* 淇敼鍐滄埛鍗′俊鎭細
@@ -263,12 +311,14 @@
* 娣诲姞琛ュ崱璁板綍
*/
SeActiveCard activeCard = new SeActiveCard();
- activeCard.setCardnum(cardNum);
- activeCard.setClientnum(clientNum);
+ //activeCard.setCardnum(cardNum);
+ //activeCard.setClientnum(clientNum);
+ activeCard.setCardid(cardId);
+ activeCard.setClientid(clientId);
activeCard.setCardcost(cardCost);
activeCard.setPaymentid(paymentId);
activeCard.setReissueamount(reissueAmount);
- activeCard.setOperatetype(OperateTypeENUM.REPLACE.getCode());
+ activeCard.setOperatetype(OperateTypeENUM.REISSUE.getCode());
activeCard.setRemarks(remarks);
activeCard.setOperator(operator);
activeCard.setOperatedt(replaceTime);
--
Gitblit v1.8.0