autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 支付宝小程序

Browse Source
This commit is contained in:
Guoqs
2024-06-18 09:36:02 +08:00
parent 3e31eddb44
commit 41d297b755
9 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java
View File

@@ -249,4 +249,26 @@ public class PersonPileController extends BaseController {
/**
* 个人桩启动充电
*/
/**
* 取消预约
*/
public RestApiResponse<?> canal(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto) {
logger.info("取消预约params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
pileService.canalReserved(dto);
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.error("取消预约error", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("取消预约error", e);
response = new RestApiResponse<>(e);
}
logger.info("取消预约result:{}", response);
return response;
}
}

5
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -247,9 +247,10 @@ public class MemberService {
String decrypt = Factory.Util.AES().decrypt(dto.getMobileNumberCiphertext());
String mobileNumber = JSON.parseObject(decrypt).getString("mobile");
// 获取buyer_id
// 根据appid查询merchantId
String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(dto.getAppId());
firstLevelMerchantId = "1";
String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAliAppId(dto.getAppId());
// 查询手机号码是否注册过
MemberRegisterAndLoginDTO loginDTO = MemberRegisterAndLoginDTO.builder()

13
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -555,4 +555,17 @@ public class PileService {
}
return 1;
}
/**
* 查询充电桩预约记录
*/
/**
* 取消预约充电
* @param dto
*/
public void canalReserved(QueryPersonPileDTO dto) {
}
}

3
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java
View File

@@ -5,9 +5,11 @@ import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.jsowell.adapay.dto.*;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.adapay.vo.AdapayAccountBalanceVO;
import com.jsowell.common.annotation.Log;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.domain.AjaxResult;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.StringUtils;
@@ -183,6 +185,7 @@ public class AdapayMemberController extends BaseController {
* http://localhost:8080/adapay/member/drawCash
*/
@PostMapping("/drawCash")
@Log(title = "汇付余额提现到银行卡", businessType = BusinessType.UPDATE)
public AjaxResult drawCash(@RequestBody WithdrawDTO dto) {
AjaxResult result;
try {