From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 17:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 82 +++++++++++++++++++++++++++
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java | 4
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 16 ++--
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java | 22 +++++++
4 files changed, 114 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index cd56a9e..14875d7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -21,22 +21,22 @@
server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c203d220-3f0c-43f7-88e1-f298717e61e4
+ namespace: 5b0cc96f-d058-4986-a46f-64644ff8a467
# 线上nacos需要鉴权
-# username: nacos
-# password: jdhs_nacos!
username: nacos
- password: nacos
+ password: jdhs_nacos!
+# username: nacos
+# password: nacos
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
group: DEFAULT_GROUP
- namespace: c203d220-3f0c-43f7-88e1-f298717e61e4
+ namespace: 5b0cc96f-d058-4986-a46f-64644ff8a467
# 线上nacos需要鉴权
-# username: nacos
-# password: jdhs_nacos!
username: nacos
- password: nacos
+ password: jdhs_nacos!
+# username: nacos
+# password: nacos
name: ${spring.application.name}
# 配置文件格式
file-extension: yml
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index b57f0c3..b20e4bd 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -525,6 +525,88 @@
return null;
}
+ @ApiOperation(value = "扫码支付",tags = {"后台2.0-总平台"})
+ @PostMapping(value = "/code/buyPlatform")
+ public R buyPlatform(@RequestParam BigDecimal money,Integer id) throws AlipayApiException, IOException {
+ Franchisee byId = franchiseeService.getById(id);
+ String code = generateTradeNumber();
+ int i = money.multiply(BigDecimal.valueOf(100)).intValue();
+ String key = "ad273ceb5e1b49e68d5c565d28d1d305";/** md5密钥商户后台-商户中心-商户设置-密钥管理获取 必填！*/
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("p0_Version", "2.5");/** 版本号 */
+ map.put("p1_MerchantNo", "888122400007793");/** 商户编号 */
+ map.put("p2_OrderNo", code); /**商户订单号*/
+ map.put("p3_Amount", String.valueOf(money));/**订单金额*/
+ map.put("p4_Cur", "1"); /**交易币种 */
+ map.put("p5_ProductName", "充值"); /** 商品名称 */
+ map.put("p6_ProductDesc", "加盟商充值"); /** 商品名称 */
+// map.put("p7_Mp", ""); /** 如果商户请求时传递了该参数，则返回给商户时会原值传 回。 */
+ map.put("p9_NotifyUrl", "http://101.34.55.62:9100/admin/franchisee/callBack"); /** 服务器异步通知地址 */
+ map.put("q1_FrpCode", "WEIXIN_NATIVE"); /** 微信扫码（主扫）【注：此为用户主扫，商户被扫】*/
+ map.put("q4_IsShowPic", "1"); /** 是否展示二 维码图片 1表示输出*/
+ map.put("q7_AppId", "wx1a4a7760be53a835"); /** 交易类型*/
+ map.put("qa_TradeMerchantNo", "777165000859101"); /** 777开头的报备商户号 必填！*/
+ map.put("qi_FqSellerPercen", "0"); /** 卖家承担收 费比例 目前仅支持传入 0 ，即用户承 担手续费！*/
+
+ String Strmap = CreateLinkStringByGet1.createLinkStringByGet(map);
+
+ // 签名
+ String sign = "";
+ sign = Md5_Sign.SignByMD5(Strmap, key);
+ map.put("hmac", sign);/** 签名数据 */
+ System.out.println("发送:" + JSON.toJSONString(map).toString());
+
+ // post请求参数内容
+ HttpRequester hr = new HttpRequester();
+ HttpRespons HP = hr.sendPost("https://trade.joinpay.com/tradeRt/uniPay", map);
+ System.out.println("接收返回参数：" + HP.getContent());
+ JSONObject jsonObject = JSONObject.parseObject(HP.getContent());
+ String rcResult = jsonObject.getString("rd_Pic");
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("rcResult", rcResult);
+// com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest prepayRequest = new com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest();
+// prepayRequest.setAppid(weChatConfig.appId);
+// prepayRequest.setMchid(weChatConfig.merchantId);
+// prepayRequest.setOutTradeNo(code);
+// prepayRequest.setDescription("购买资料");
+// prepayRequest.setNotifyUrl("http://www.zhipingwang.com.cn:9090/admin/franchisee/callBack");
+// com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
+// amount.setTotal(i);
+// prepayRequest.setAmount(amount);
+// // 调用下单方法，得到应答
+// com.wechat.pay.java.service.partnerpayments.app.model.PrepayResponse response;
+ try {
+// com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse prepay = nativePayService.prepay(prepayRequest);
+ //预支付成功，创建预支付订单
+ TFranchiseeBalanceChange tFranchiseeBalanceChange = new TFranchiseeBalanceChange();
+ tFranchiseeBalanceChange.setAmount(money);
+ tFranchiseeBalanceChange.setIs_pay(0);
+ tFranchiseeBalanceChange.setFranchiseeName(byId.getName());
+ tFranchiseeBalanceChange.setFranchiseeId(String.valueOf(byId.getId()));
+ tFranchiseeBalanceChange.setType(2);
+ tFranchiseeBalanceChange.setCode(code);
+ tFranchiseeBalanceChange.setRemark("加盟商扫码充值");
+ balanceChangeService.save(tFranchiseeBalanceChange);
+
+
+
+ PayDto payDto = new PayDto();
+ payDto.setOrderId(tFranchiseeBalanceChange.getId());
+ payDto.setQrCode(rcResult);
+
+ return R.ok(payDto);
+ } catch (HttpException e) { // 发送HTTP请求失败
+// log.error("发送HTTP请求失败: {}", e.getHttpRequest());
+ } catch (ServiceException e) { // 服务返回状态小于200或大于等于300，例如500
+// log.error("服务返回状态异常: {}", e.getResponseBody());
+ } catch (MalformedMessageException e) { // 服务返回成功，返回体类型不合法，或者解析返回体失败
+// log.error("返回体类型不合法: {}", e.getMessage());
+ } catch (Exception e) {
+// log.error("预下单异常: {}", e.getMessage());
+ }
+ return null;
+
+ }
@ApiOperation(value = "轮询获取支付状态",tags = {"后台2.0-加盟商列表余额"})
@PostMapping(value = "/code/check")
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
index aacae71..68a3a4a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
@@ -76,6 +76,28 @@
return R.ok(wrapper.eq(RecoveryServe::getIsDelete, 0)
.orderByDesc(RecoveryServe::getCreateTime).page(Page.of(pageNum, pageSize)));
}
+ @ApiOperation(value = "服务名称下拉列表", tags = {"后台-订单管理-服务名称下拉列表"})
+ @GetMapping(value = "/pageList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "服务名称", name = "serveName", dataType = "String"),
+ @ApiImplicitParam(value = "回收价格起点", name = "startPrice", dataType = "String"),
+ @ApiImplicitParam(value = "回收价格终点", name = "endPrice", dataType = "String"),
+ @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
+ })
+ public R<IPage<RecoveryServe>> pageList(String serveName, String startPrice, String endPrice,
+ @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LambdaQueryChainWrapper<RecoveryServe> wrapper = recoveryServeService.lambdaQuery();
+ wrapper.orderByDesc(RecoveryServe::getSort);
+ // 服务名称模糊匹配
+ wrapper = StringUtils.isNotBlank(serveName) ? wrapper.like(RecoveryServe::getServeName, serveName) : wrapper;
+ // 回收价格区间匹配
+ wrapper = null != startPrice ? wrapper.ge(RecoveryServe::getDefaultPrice, startPrice) : wrapper;
+ wrapper = null != endPrice ? wrapper.le(RecoveryServe::getDefaultPrice, endPrice) : wrapper;
+ return R.ok(wrapper.eq(RecoveryServe::getIsDelete, 0)
+ .page(Page.of(pageNum, pageSize)));
+ }
/**
* 回收服务列表
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java
index d7d6c1d..aea0239 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MenuServiceImpl.java
@@ -37,6 +37,7 @@
public List<Menu> menuTree() {
// redis缓存
Map<Object, Object> regionList = redisTemplate.opsForHash().entries(RedisConstants.MENU_TREE);
+// Map<Object, Object> regionList = new HashMap<>();
// 获取所有地区信息 省市区三级
List<Menu> regions = getReginList(regionList);
Map<String, Menu> courseTypeMap = new HashMap<>();
@@ -47,8 +48,7 @@
courseTypeMap = regions.stream().filter(region -> region.getMenuId() != 88900&&
region.getMenuId() != 88901&&
region.getMenuId() != 88902&&
- region.getMenuId() != 88903).
- collect(Collectors.toMap(region -> region.getMenuId().toString()
+ region.getMenuId() != 88903).collect(Collectors.toMap(region -> region.getMenuId().toString()
, region -> region));
}
--
Gitblit v1.7.1