autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-25 09:39:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-zza' into dev

Browse Source
This commit is contained in:
Lemon
2025-07-01 09:19:24 +08:00
parent 0e6fe115a3 2de93f190e
commit 2ce0bfacc6
16 changed files with 720 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java
View File

@@ -17,7 +17,7 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.base.MemberWalletVO;
import com.jsowell.pile.vo.uniapp.customer.MemberFeedbackVO;
import com.jsowell.pile.vo.uniapp.customer.MemberFeedbackInfoVO;
import com.jsowell.pile.vo.uniapp.customer.InvoiceTitleVO;
import com.jsowell.pile.vo.uniapp.customer.MemberVO;
import com.jsowell.pile.vo.uniapp.customer.MemberWalletInfoVO;
@@ -60,7 +60,7 @@ public class MemberController extends BaseController {
private PileStationInfoService pileStationInfoService;
@Autowired
private MemberFeedbackService memberFeedbackService;
private MemberFeedbackInfoService memberFeedbackInfoService;
/**
* 下发短信接口 business
@@ -688,12 +688,12 @@ public class MemberController extends BaseController {
* @return
*/
@PostMapping("/saveFeedback")
public RestApiResponse<?> saveFeedback(HttpServletRequest request, @RequestBody MemberFeedbackDTO dto) {
public RestApiResponse<?> saveFeedback(HttpServletRequest request, @RequestBody MemberFeedbackInfoDTO dto) {
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
memberFeedbackService.saveFeedback(dto);
memberFeedbackInfoService.saveFeedbackInfo(dto);
response = new RestApiResponse<>();
}catch (Exception e) {
logger.error("用户反馈信息保存 error", e);
@@ -714,7 +714,7 @@ public class MemberController extends BaseController {
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
List<MemberFeedbackVO> list = memberFeedbackService.getFeedbackList(memberId);
List<MemberFeedbackInfoVO> list = memberFeedbackInfoService.getInfoListByMemberId(memberId);
logger.info("用户获取反馈信息列表 list:{}", JSON.toJSONString(list));
response = new RestApiResponse<>(ImmutableMap.of("list", list));
}catch (Exception e) {