Merge branch 'dev' into dev-g

2026-04-20 19:15:35 +08:00 · 2025-07-01 14:16:59 +08:00
parent a2933ec04d f6a3cd55d6
commit 758b7da56e
29 changed files with 1088 additions and 640 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChangZhouController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ChangZhouController.java
@@ -10,6 +10,7 @@ import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.common.CommonResult;
+import com.jsowell.thirdparty.platform.dto.RetryOrderDTO;
 import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -468,4 +469,38 @@ public class ChangZhouController extends ThirdPartyBaseController {
        return response;
    }

+    /**
+     * 获取充电订单信息
+     * retry_notification_order_info
+     * @param request
+     * @param dto
+     * @return
+     */
+    @PostMapping("/v1/retry_notification_order_info")
+    public CommonResult<?> retry_notification_order_info(HttpServletRequest request , @RequestBody CommonParamsDTO dto) {
+        logger.info("{}-获取充电订单信息 params:{}" , platformName , JSON.toJSONString(dto));
+        try {
+            // 校验令牌
+            if (!verifyToken(request.getHeader("Authorization"))) {
+                // 校验失败
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR);
+            }
+            // 校验签名
+            if (!verifySignature(dto)) {
+                // 签名错误
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR);
+            }
+            // 解析入参
+            RetryOrderDTO retryOrderDTO = parseParamsDTO(dto , RetryOrderDTO.class);
+            // 执行逻辑
+            Map<String, String> map = platformLogic.retryNotificationOrderInfo(retryOrderDTO.getStartChargeSeqs());
+            logger.info("{}-获取充电订单信息 result:{}" , platformName , map);
+            return CommonResult.success(0 , "获取充电订单信息成功！" , map.get("Data") , map.get("Sig"));
+        } catch (Exception e) {
+            logger.error("{}-获取充电订单信息 error" , platformName , e);
+        }
+        return CommonResult.failed("{}-获取充电订单信息发生异常");
+
+    }
+
 }
--- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SiChuanController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/SiChuanController.java
@@ -208,4 +208,14 @@ public class SiChuanController extends ThirdPartyBaseController {
        return CommonResult.success(0 , "推送充电站信息成功！" , s , null);
    }

+
+    /**
+     * 推送
+     */
+
+
+
+
+
+
 }
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java
@@ -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) {
--- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
@@ -131,9 +131,9 @@ public class MemberService {
 	public void checkVerificationCode(MemberRegisterAndLoginDTO dto) {
 		// 取出缓存中的验证码进行对比，如果缓存中没有，则超时
 		String captchaCode = redisCache.getCacheObject(CacheConstants.SMS_VERIFICATION_CODE_KEY + dto.getMobileNumber());
-		if (StringUtils.isEmpty(captchaCode)) {
-			throw new BusinessException(ReturnCodeEnum.CODE_VERIFICATION_CODE_TIMEOUT_ERROR);
-		}
+		// if (StringUtils.isEmpty(captchaCode)) {
+		// 	throw new BusinessException(ReturnCodeEnum.CODE_VERIFICATION_CODE_TIMEOUT_ERROR);
+		// }
 		// 获取通用验证码
 		String commonCaptchaCode = redisCache.getCacheObject(CacheConstants.SMS_COMMON_VERIFICATION_CODE_KEY + dto.getMobileNumber());

--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberFeedbackController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberFeedbackController.java
@@ -1,72 +0,0 @@
-package com.jsowell.web.controller.pile;
-
-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.TableDataInfo;
-import com.jsowell.common.enums.BusinessType;
-import com.jsowell.pile.dto.MemberFeedbackDTO;
-import com.jsowell.pile.dto.QueryMemberFeedbackDTO;
-import com.jsowell.pile.service.MemberFeedbackService;
-import com.jsowell.pile.vo.uniapp.customer.MemberFeedbackVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 会员反馈信息Controller
- *
- * @author jsowell
- * @date 2023-10-12
- */
-@RestController
-@RequestMapping("/member/feedback")
-public class MemberFeedbackController extends BaseController {
-
-    @Autowired
-    private MemberFeedbackService memberFeedbackService;
-
-    /**
-     * 分页查询会员反馈列表
-     */
-    @PreAuthorize("@ss.hasPermi('member:feedback:list')")
-    @PostMapping("/list")
-    public TableDataInfo list(@RequestBody QueryMemberFeedbackDTO dto) {
-        List<MemberFeedbackVO> list = memberFeedbackService.selectFeedbackList(dto);
-        return getDataTable(list);
-    }
-
-    /**
-     * 根据ID获取反馈详情
-     */
-    @PreAuthorize("@ss.hasPermi('member:feedback:query')")
-    @GetMapping("/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        MemberFeedbackVO feedback = memberFeedbackService.getFeedbackById(id);
-        return AjaxResult.success(feedback);
-    }
-
-    /**
-     * 修改反馈内容（回复）
-     */
-    @PreAuthorize("@ss.hasPermi('member:feedback:edit')")
-    @Log(title = "修改会员反馈", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
-    public AjaxResult edit(@RequestBody QueryMemberFeedbackDTO dto) {
-        memberFeedbackService.updateFeedback(dto);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 删除反馈信息
-     */
-    @PreAuthorize("@ss.hasPermi('member:feedback:remove')")
-    @Log(title = "删除会员反馈", businessType = BusinessType.DELETE)
-    @DeleteMapping
-    public AjaxResult remove(@RequestParam List<Long> ids) {
-        memberFeedbackService.deleteFeedbackByIds(ids);
-        return AjaxResult.success();
-    }
-}
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberFeedbackInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberFeedbackInfoController.java
@@ -0,0 +1,120 @@
+package com.jsowell.web.controller.pile;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.jsowell.pile.service.MemberFeedbackInfoService;
+import com.jsowell.pile.vo.uniapp.customer.MemberFeedbackInfoVO;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.jsowell.common.annotation.Log;
+import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.domain.AjaxResult;
+import com.jsowell.common.enums.BusinessType;
+import com.jsowell.pile.domain.MemberFeedbackInfo;
+import com.jsowell.common.util.poi.ExcelUtil;
+import com.jsowell.common.core.page.TableDataInfo;
+
+/**
+ * 用户问题反馈Controller
+ *
+ * @author jsowell
+ * @date 2025-06-26
+ */
+@RestController
+@RequestMapping("/pile/memberFeedbackInfo")
+public class MemberFeedbackInfoController extends BaseController {
+    @Autowired
+    private MemberFeedbackInfoService memberFeedbackInfoService;
+
+    /**
+     * 查询用户问题反馈列表
+     */
+    @PreAuthorize("@ss.hasPermi('pile:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(MemberFeedbackInfo memberFeedbackInfo) {
+        startPage();
+        List<MemberFeedbackInfo> list = memberFeedbackInfoService.selectMemberFeedbackInfoList(memberFeedbackInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户问题反馈列表
+     */
+    @PreAuthorize("@ss.hasPermi('pile:info:export')")
+    @Log(title = "用户问题反馈", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, MemberFeedbackInfo memberFeedbackInfo) {
+        List<MemberFeedbackInfo> list = memberFeedbackInfoService.selectMemberFeedbackInfoList(memberFeedbackInfo);
+        ExcelUtil<MemberFeedbackInfo> util = new ExcelUtil<MemberFeedbackInfo>(MemberFeedbackInfo.class);
+        util.exportExcel(response, list, "用户问题反馈数据");
+    }
+
+    /**
+     * 获取用户问题反馈详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('pile:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(memberFeedbackInfoService.selectMemberFeedbackInfoById(id));
+    }
+
+    /**
+     * 新增用户问题反馈
+     */
+    @PreAuthorize("@ss.hasPermi('pile:info:add')")
+    @Log(title = "用户问题反馈", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody MemberFeedbackInfo memberFeedbackInfo) {
+        return toAjax(memberFeedbackInfoService.insertMemberFeedbackInfo(memberFeedbackInfo));
+    }
+
+    /**
+     * 修改用户问题反馈
+     */
+    @PreAuthorize("@ss.hasPermi('pile:info:edit')")
+    @Log(title = "用户问题反馈", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody MemberFeedbackInfo memberFeedbackInfo) {
+        return toAjax(memberFeedbackInfoService.updateMemberFeedbackInfo(memberFeedbackInfo));
+    }
+
+    /**
+     * 删除用户问题反馈
+     */
+    @PreAuthorize("@ss.hasPermi('pile:info:remove')")
+    @Log(title = "用户问题反馈", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(memberFeedbackInfoService.deleteMemberFeedbackInfoByIds(ids));
+    }
+
+    /**
+     * 后管管理员通过feedbackCode查询信息详情
+     * @param feedbackCode
+     * @return
+     */
+    @GetMapping("/getMemberFeedbackDetailByCode/{feedbackCode}")
+    public MemberFeedbackInfoVO getMemberFeedbackDetailByCode(@PathVariable("feedbackCode") String feedbackCode) {
+        return memberFeedbackInfoService.getMemberFeedbackDetailByCode(feedbackCode);
+    }
+
+    /**
+     * 后管管理员处理用户反馈信息（实际调用修改方法，将该反馈信息状态改为处理中）
+     * @param memberFeedbackInfo
+     * @return
+     */
+    @PostMapping("/dealUserFeedback")
+    public AjaxResult dealUserFeedback(@RequestBody MemberFeedbackInfo memberFeedbackInfo) {
+        memberFeedbackInfoService.dealUserFeedback(memberFeedbackInfo);
+        return AjaxResult.success();
+    }
+}