feat："增加提现记录查询，优化部分接口"

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -33,7 +33,10 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
                 "/tTimeRule/**",
                 "/sysRoleMenu/**",
                 "/tEquipmentApply/**",
-                "/tEquipment/**",
+                "/tEquipment/getEquipmentBool",
+                "/tEquipment/getEquipmentByLatLon",
+                "/tEquipment/findEquipmentByClientId",
+                "/tEquipment/updateByEquipment",
                 "/api/**",
                 "/tOrder/**",
                 "/tAlarmClock/**",

src/main/java/com/szwl/controller/CallbackController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.huifu.bspay.sdk.opps.core.utils.RsaUtils;
 import com.szwl.constant.HuifuConstant;
 import com.szwl.constant.JoinpayConstant;
 import com.szwl.model.entity.WithdrawalRecord;
@@ -14,11 +13,11 @@ import com.szwl.service.WithdrawalRecordService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,25 +36,25 @@ public class CallbackController {
     private WithdrawalRecordService withdrawalRecordService;
 
     @ApiOperation("汇聚提现回调")
-    @GetMapping("/withdrawJoinPay")
-    public Object withdrawJoinPay(HttpServletRequest request) {
-
-        String resp_code = request.getParameter("resp_code");
-        String da = request.getParameter("data");
-        JSONObject data =JSONObject.parseObject(da);
+    @PostMapping("/withdrawJoinPay")
+    public Object withdrawJoinPay(@RequestBody Map<String, Object> rawData) {
+        log.info("汇聚提现回调，参数，rawData={}", rawData);
+        String respCode = (String) rawData.get("resp_code");
+        Map<String, Object> data = (Map<String, Object>) rawData.get("data");
 
         // 交易状态
-        String orderStatus = data.getString("order_status");
+        String orderStatus = (String)data.get("order_status");
         // 分账方编号
-        String mchOrderNo = data.getString("mch_order_no");
+        String mchOrderNo = (String)data.get("mch_order_no");
         LambdaQueryWrapper<WithdrawalRecord> query = Wrappers.lambdaQuery();
         query.eq(WithdrawalRecord::getOrderNo, mchOrderNo);
         WithdrawalRecord withdrawalRecord = withdrawalRecordService.getOne(query);
         withdrawalRecord.setStatus(2);
-        if (JoinpayConstant.order_status1.equals(orderStatus)) {
+        if (JoinpayConstant.order_status2.equals(orderStatus)) {
+            withdrawalRecord.setArrivalDate(new Date());
             withdrawalRecord.setStatus(1);
         }
-        String bizMsg = data.getString("biz_msg");
+        String bizMsg = (String)data.get("biz_msg");
         withdrawalRecord.setResultMsg(bizMsg);
         withdrawalRecordService.updateById(withdrawalRecord);
 
@@ -91,7 +90,6 @@ public class CallbackController {
             withdrawalRecord.setStatus(2);
             if (HuifuConstant.RESP_CODE.equals(subRespCode)) {
                 // 业务处理成功
-                log.info("处理成功");
                 if (HuifuConstant.TRANS_STAT_S.equals(transStat)) {
                     withdrawalRecord.setStatus(1);
                 } else {
@@ -99,7 +97,6 @@ public class CallbackController {
                 }
             } else {
                 // 业务处理失败
-                log.info("处理失败");
                 withdrawalRecord.setResultMsg(respDesc);
             }
             withdrawalRecordService.updateById(withdrawalRecord);

src/main/java/com/szwl/controller/PurseController.java

@@ -2,6 +2,7 @@ package com.szwl.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huifu.bspay.sdk.opps.core.exception.BasePayException;
 import com.szwl.constant.JoinpayConstant;
 import com.szwl.model.bo.BalanceBo;
@@ -10,10 +11,9 @@ import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.bo.SettlementRecordBo;
 import com.szwl.model.dto.LicenseDTO;
 import com.szwl.model.entity.*;
-import com.szwl.service.TAdminService;
-import com.szwl.service.THuifuMchService;
-import com.szwl.service.TJoinpayMchService;
-import com.szwl.service.UserLicenseService;
+import com.szwl.model.param.MqttMsgParam;
+import com.szwl.model.param.WithdrawRecordParam;
+import com.szwl.service.*;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +49,9 @@ public class PurseController {
     @Autowired
     private UserLicenseService userLicenseService;
 
+    @Autowired
+    private WithdrawalRecordService withdrawalRecordService;
+
     @ApiOperation("余额查询")
     @GetMapping("/balance")
     public ResponseModel<?> balance(Long adminId) {
@@ -89,10 +92,28 @@ public class PurseController {
     }
 
     @ApiOperation("查询提现记录")
-    @GetMapping("/withdrawRecord")
-    public ResponseModel<?> withdrawRecord(Long adminId, String date) {
-
-        return R.ok();
+    @PostMapping("/withdrawRecordList")
+    public ResponseModel<?> withdrawRecordList(@RequestBody WithdrawRecordParam param) {
+        LambdaQueryWrapper<WithdrawalRecord> query = Wrappers.lambdaQuery();
+        if (StringUtils.isNotEmpty(param.getStartTime()) && StringUtils.isNotEmpty(param.getEndTime())) {
+            query.between(WithdrawalRecord::getCreateDate, param.getStartTime(), param.getEndTime());
+        }
+        if (param.getAdminId() != null) {
+            query.eq(WithdrawalRecord::getAdminId, param.getAdminId());
+        }
+        if (StringUtils.isNotEmpty(param.getOrderNo())) {
+            query.eq(WithdrawalRecord::getOrderNo, param.getOrderNo());
+        }
+        if (param.getStatus() != null) {
+            query.eq(WithdrawalRecord::getStatus, param.getStatus());
+        }
+        if (StringUtils.isNotEmpty(param.getPayPlatform())) {
+            query.eq(WithdrawalRecord::getPayPlatform, param.getPayPlatform());
+        }
+        query.orderByDesc(WithdrawalRecord::getCreateDate);
+        Page<WithdrawalRecord> page = new Page<>(param.getCurrent(), param.getSize(), true);
+        Page<WithdrawalRecord> recordPage = withdrawalRecordService.page(page, query);
+        return R.ok(recordPage);
     }
 
 

src/main/java/com/szwl/model/param/WithdrawRecordParam.java

@@ -0,0 +1,16 @@
+package com.szwl.model.param;
+
+import com.szwl.model.entity.WithdrawalRecord;
+import lombok.Data;
+
+@Data
+public class WithdrawRecordParam extends WithdrawalRecord {
+
+    private long current;
+
+    private long size;
+
+    private String startTime;
+
+    private String endTime;
+}

src/main/java/com/szwl/service/impl/TJoinpayMchServiceImpl.java

@@ -731,8 +731,10 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
         //结算请求号
         String mch_order_no = RandomUtil.randomNumbers(18);
         requestData.put("mch_order_no", mch_order_no);
+        requestData.put("product_code", "2");
         //通知地址
         requestData.put("callback_url",JoinpayConstant.Jiesuan_Url);
+
         JSONObject requestJson = new JSONObject(new TreeMap<String, Object>());
         requestJson.put("method", "altSettle.launch");
         requestJson.put("version", "1.1");