Переглянути джерело

chore(logging): 在小程序相关接口中添加操作日志注解

- 在AppletChargeController的方法上添加@Log注解,实现启用和结束充电的日志记录
- 在AppletOrderController中为支付、取消、退款接口添加@Log注解
- 在AppletUserController中为用户绑定企业、用户反馈、优惠券领取等操作添加日志记录注解
- 扩展LogModuleEnum,新增APP_ORDER、APP_CHARGE_ORDER和APP_OTHER日志模块
- 修正UserOrderInfoMapper.xml中字段名,从app_id改为transaction_id
- 更新微信支付v3通知和退款通知的URL为新地址
- 代码格式及无用import优化,去除WechatPayV3Utils中的多余导入
- 移除AdvertisingController上的@RequiredArgsConstructor注解,改用手动注入成员变量
wzq 1 день тому
батько
коміт
fe20a89858

+ 1 - 1
src/main/java/com/zsElectric/boot/business/controller/AdvertisingController.java

@@ -28,7 +28,7 @@ import jakarta.validation.Valid;
 @RestController
 @RequestMapping("/api/v1/advertising")
 @RequiredArgsConstructor
-public class AdvertisingController  {
+public class AdvertisingController {
 
     private final AdvertisingService advertisingService;
 

+ 4 - 0
src/main/java/com/zsElectric/boot/business/controller/applet/AppletChargeController.java

@@ -7,6 +7,8 @@ import com.zsElectric.boot.business.model.query.applet.AppChargeOrderInfoQuery;
 import com.zsElectric.boot.business.model.vo.ChargeOrderInfoVO;
 import com.zsElectric.boot.business.model.vo.applet.AppChargeVO;
 import com.zsElectric.boot.business.service.ChargeOrderInfoService;
+import com.zsElectric.boot.common.annotation.Log;
+import com.zsElectric.boot.common.enums.LogModuleEnum;
 import com.zsElectric.boot.core.web.Result;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -49,6 +51,7 @@ public class AppletChargeController {
      */
     @Operation(summary = "启用充电")
     @PostMapping("/invokeCharge")
+    @Log(value = "启用充电", module = LogModuleEnum.APP_CHARGE_ORDER)
     public Result<AppChargeVO> invokeCharge(@Valid @RequestBody AppInvokeChargeForm formData) {
         AppChargeVO appInvokeChargeVO = chargeOrderInfoService.invokeCharge(formData);
         return Result.success(appInvokeChargeVO);
@@ -62,6 +65,7 @@ public class AppletChargeController {
      */
     @Operation(summary = "结束充电")
     @PostMapping("/stopCharge")
+    @Log(value = "结束充电", module = LogModuleEnum.APP_CHARGE_ORDER)
     public Result<AppChargeVO> stopCharge(@RequestBody AppStopChargeForm formData) {
         AppChargeVO appStopChargeVO= chargeOrderInfoService.stopCharge(formData);
         return Result.success(appStopChargeVO);

+ 5 - 0
src/main/java/com/zsElectric/boot/business/controller/applet/AppletOrderController.java

@@ -9,7 +9,9 @@ import com.zsElectric.boot.business.model.query.applet.AppUserOrderInfoQuery;
 import com.zsElectric.boot.business.model.vo.UserOrderInfoVO;
 import com.zsElectric.boot.business.service.RechargeLevelService;
 import com.zsElectric.boot.business.service.UserOrderInfoService;
+import com.zsElectric.boot.common.annotation.Log;
 import com.zsElectric.boot.common.constant.SystemConstants;
+import com.zsElectric.boot.common.enums.LogModuleEnum;
 import com.zsElectric.boot.core.web.Result;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -78,6 +80,7 @@ public class AppletOrderController {
      */
     @Operation(summary = "订单-支付")
     @PutMapping("/payOrder/{orderId}")
+    @Log(value = "订单-支付", module = LogModuleEnum.APP_ORDER)
     public Result<AppUserPayForm> payOrder(@PathVariable("orderId") String orderId) {
         return Result.success(userOrderInfoService.payOrder(orderId));
     }
@@ -115,6 +118,7 @@ public class AppletOrderController {
      */
     @Operation(summary = "订单主动取消")
     @PutMapping("/cancelOrder/{orderId}")
+    @Log(value = "订单主动取消", module = LogModuleEnum.APP_ORDER)
     public Result<String> cancelOrder(@PathVariable(name = "orderId") String orderId) {
         return Result.success(userOrderInfoService.cancelOrder(orderId));
     }
@@ -125,6 +129,7 @@ public class AppletOrderController {
      */
     @Operation(summary = "账户退款")
     @PutMapping("/refundOrder")
+    @Log(value = "账户退款", module = LogModuleEnum.APP_ORDER)
     public Result<String> refundOrder() throws Exception {
         return Result.success(userOrderInfoService.refundOrder());
     }

+ 6 - 0
src/main/java/com/zsElectric/boot/business/controller/applet/AppletUserController.java

@@ -16,7 +16,9 @@ import com.zsElectric.boot.business.service.CouponService;
 import com.zsElectric.boot.business.service.CouponTemplateService;
 import com.zsElectric.boot.business.service.UserFeedbackService;
 import com.zsElectric.boot.business.service.UserInfoService;
+import com.zsElectric.boot.common.annotation.Log;
 import com.zsElectric.boot.common.constant.SystemConstants;
+import com.zsElectric.boot.common.enums.LogModuleEnum;
 import com.zsElectric.boot.core.web.Result;
 import com.zsElectric.boot.security.util.SecurityUtils;
 import io.swagger.v3.oas.annotations.Operation;
@@ -50,6 +52,7 @@ public class AppletUserController {
 
     @Operation(summary = "用户绑定企业")
     @PostMapping("/userBinding/{userId}/{firmId}")
+    @Log(value = "用户绑定企业", module = LogModuleEnum.APP_OTHER)
     public Result<Boolean> userBinding(@PathVariable("userId") Long userId, @PathVariable("firmId") Long firmId) {
         Boolean result = userInfoService.userBinding(userId, firmId);
         return Result.judge(result);
@@ -57,6 +60,7 @@ public class AppletUserController {
 
     @Operation(summary = "小程序用户反馈")
     @PostMapping("/addUserFeedback")
+    @Log(value = "小程序用户反馈", module = LogModuleEnum.APP_OTHER)
     public Result<Void> addUserFeedback(@RequestBody @Valid AppFeedbackForm formData ) {
         UserFeedbackForm userFeedbackForm = new UserFeedbackForm();
         userFeedbackForm.setType(formData.getType());
@@ -70,6 +74,7 @@ public class AppletUserController {
 
     @Operation(summary = "用户反馈答复")
     @GetMapping("/myFeedback")
+    @Log(value = "用户反馈答复", module = LogModuleEnum.OTHER)
     public Result<List<UserFeedback>> addUserFeedback() {
         List<UserFeedback> list = userFeedbackService.list(Wrappers.<UserFeedback>lambdaQuery().eq(UserFeedback::getUserId, SecurityUtils.getUserId()));
         return Result.success(list);
@@ -100,6 +105,7 @@ public class AppletUserController {
 
     @Operation(summary = "领取优惠券")
     @PostMapping("/gainCoupon")
+    @Log(value = "领取优惠券", module = LogModuleEnum.APP_OTHER)
     public Result<Boolean> gainCoupon(@RequestBody AppGainCouponForm formData) {
         Boolean result = couponService.gainCoupon(formData);
         return Result.judge(result);

+ 1 - 0
src/main/java/com/zsElectric/boot/business/service/impl/ChargeOrderInfoServiceImpl.java

@@ -178,6 +178,7 @@ public class ChargeOrderInfoServiceImpl extends ServiceImpl<ChargeOrderInfoMappe
                 throw new BusinessException("设备认证失败");
             }
 
+
             //生成系统充电订单号及互联互通充电订单号
             assert userId != null;
             String chargeOrderNo = generateNo(ORDER_NO_PREFIX, userId);

+ 4 - 1
src/main/java/com/zsElectric/boot/common/enums/LogModuleEnum.java

@@ -27,7 +27,10 @@ public enum LogModuleEnum {
     PARKING_CALL("互联互通调用"),
     STATION("充电站"),
     DEVICE("充电桩"),
-    ORDER("订单"),
+    ORDER("后台订单"),
+    APP_ORDER("APP订单"),
+    APP_CHARGE_ORDER("充电订单"),
+    APP_OTHER("APP其他操作"),
     ADMIN_ACTIONS("管理员操作"),
     ;
 

+ 1 - 3
src/main/java/com/zsElectric/boot/core/pay/WechatPayV3Utils.java

@@ -30,9 +30,7 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+
 
 @Slf4j
 @Component

+ 2 - 2
src/main/java/com/zsElectric/boot/core/pay/WechatUrlConstants.java

@@ -32,9 +32,9 @@ public interface WechatUrlConstants {
     String PAY_V2_REFUND_NOTIFY = "https://xxx.com/api/wechatPay/wechatRefundNotify";
 
     //微信支付v3 支付通知接口地址
-    String PAY_V3_NOTIFY = "https://barcodeapp.gzspy.org.cn/applet/wechatPayNotify";
+    String PAY_V3_NOTIFY = "https://cd.admin.zswlgz.com/applet/v1/order/wechatPayNotify";
 
     //微信支付v3 退款通知接口地址
-    String PAY_V3_REFUND_NOTIFY = "https://xxx.com/api/wechatPay/v3/wechatRefundNotify";
+    String PAY_V3_REFUND_NOTIFY = "https://cd.admin.zswlgz.com/applet/v1/order/callback/refundOrderNotify";
 
 }

+ 1 - 1
src/main/resources/mapper/business/UserOrderInfoMapper.xml

@@ -15,7 +15,7 @@
         out_trade_no,
         order_status,
         order_type,
-        app_id,
+        transaction_id,
         refund_money,
         refund_time,
         remark,