luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

灌溉逻辑+修改充值记录接口添加了时间检索

Browse Source
This commit is contained in:
童丽然
2024-12-31 16:52:55 +08:00
parent 48b18a9e8b
commit aba6f51ea7
17 changed files with 431 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fastbee-open-api/src/main/java/com/fastbee/data/controller/pay/WeChatPayController.java
View File

@ -12,6 +12,7 @@ import com.fastbee.common.core.domain.AjaxResult;
import com.fastbee.common.utils.pay.AesUtil;
import com.fastbee.common.utils.pay.RSAUtil;
import com.fastbee.rechargecard.domain.NgMerchants;
import com.fastbee.rechargecard.domain.dto.WeChatPlatformCertificate;
import com.fastbee.rechargecard.domain.dto.WeChatRecharge;
import com.fastbee.rechargecard.domain.dto.WeChatRechargeBacktracking;
import com.fastbee.rechargecard.mapper.NgIrrigationControllersMapper;
@ -83,9 +84,9 @@ public class WeChatPayController extends BaseController {
*/
@ApiOperation("获取平台证书")
@GetMapping("/getPlatformCertificate")
public AjaxResult getPlatformCertificate(@RequestBody String mchId,@RequestBody String privateKey,@RequestBody String serial_no,@RequestBody String apiV3Key)
public AjaxResult getPlatformCertificate(@RequestBody WeChatPlatformCertificate weChatPlatformCertificate)
{
return success(userWechatPayService.getPlatformCertificat(mchId,privateKey,serial_no,apiV3Key));
return success(userWechatPayService.getPlatformCertificat(weChatPlatformCertificate));
}
/**

8
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUserRechargeRecordsController.java
View File

@ -4,6 +4,8 @@ import java.util.Comparator;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateTime;
import com.fastbee.rechargecard.domain.dto.NgUserRechargeRecordsDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@ -45,16 +47,18 @@ public class NgUserRechargeRecordsController extends BaseController
// @PreAuthorize("@ss.hasPermi('rechargecard:records:list')")
@GetMapping("/list")
@ApiOperation("查询用户充值记录列表")
public TableDataInfo list(NgUserRechargeRecords ngUserRechargeRecords)
public TableDataInfo list(NgUserRechargeRecordsDto ngUserRechargeRecords)
{
startPage();
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords);
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsListByTime(ngUserRechargeRecords);
//按照充值时间由近到远排序
// list.sort(Comparator.comparing(NgUserRechargeRecords::getRechargeTime).reversed());
// System.err.println("充值list = " + list);
return getDataTable(list);
}
/**
* 导出用户充值记录列表
*/