修复相关
This commit is contained in:
parent
97e4a96dca
commit
c436aa8d9d
@ -53,7 +53,8 @@ public class WechatPayConfig {
|
||||
/**
|
||||
* 支付通知回调地址
|
||||
*/
|
||||
private String notifyUrl="https://www.nuoyunr.com/rescue/rescuePayApi/payNotify";
|
||||
private String notifyUrl="https://www.nuoyunr.com/admin-api/rescuePayApi/payNotify";
|
||||
private String jcNotifyUrl="https://www.nuoyunr.com/admin-api/payApi/payNotify";
|
||||
/**
|
||||
* 退款回调地址
|
||||
*/
|
||||
@ -83,7 +84,6 @@ public class WechatPayConfig {
|
||||
|
||||
private String jcAppId = "wx5eeea06aeaae4f89";
|
||||
private String jcAppSecret = "42207958589342d9d1d287b9cb53e289";
|
||||
private String jcNotifyUrl="https://www.nuoyunr.com/admin-api/payApi/payNotify";
|
||||
private String jcRefundNotifyUrl="https://www.nuoyunr.com/admin-api/payApi/refundNotify";
|
||||
|
||||
private String repairAppId="wxee677d54037bc5ac";
|
||||
|
||||
@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@ -385,7 +386,7 @@ public class AppInspectionGoodsServiceImpl extends ServiceImpl<AppInspectionGood
|
||||
res.setCouponNum(count);
|
||||
//计算积分余额
|
||||
UserBalance shopUserBalance = userBalanceService.selectShopUserBalanceByUserId(userId);
|
||||
res.setBalance(shopUserBalance.getBalance());
|
||||
res.setBalance(ObjectUtils.isEmpty(shopUserBalance)?0:shopUserBalance.getBalance());
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
||||
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
|
||||
import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
|
||||
import cn.iocoder.yudao.module.partner.entity.PartnerBankInfo;
|
||||
import cn.iocoder.yudao.module.payment.entity.FzRecord;
|
||||
@ -187,6 +188,7 @@ public class WxPayController {
|
||||
*/
|
||||
|
||||
@GetMapping("/jcPrepayment")
|
||||
@TenantIgnore
|
||||
public Map<String,Object> jcPrepayment(String type,Long orderId) throws SignatureException, NoSuchAlgorithmException, InvalidKeyException, IOException {
|
||||
|
||||
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
|
||||
@ -198,7 +200,7 @@ public class WxPayController {
|
||||
|
||||
String prepayId = this.toGetPayInfo(wechatPayConfig.getJcAppId(), bankInfo.getMchId(), bankInfo.getApiclientKey(), orderInfo.getPayMoney().intValue()
|
||||
, user.getJcOpenId(), bankInfo.getSerialNo(), bankInfo.getApiV3Key(), orderInfo.getGoodsTitle(),
|
||||
wechatPayConfig.getNotifyUrl(), orderInfo.getOrderNo());
|
||||
wechatPayConfig.getJcNotifyUrl(), orderInfo.getOrderNo());
|
||||
Map<String, Object> resMap = paySignMsg(prepayId, wechatPayConfig.getJcAppId(),bankInfo.getApiclientKey());
|
||||
return resMap;
|
||||
}
|
||||
|
||||
@ -113,7 +113,7 @@
|
||||
sum((oi.pay_time like CONCAT(#{timeStr},'%') and oi.create_time like CONCAT(#{timeStr},'%'))),0) as workedNum
|
||||
FROM
|
||||
order_info oi
|
||||
WHERE oi.partner_id = #{partnerId}
|
||||
|
||||
</select>
|
||||
<select id="allAmount" resultType="java.lang.Integer">
|
||||
SELECT
|
||||
|
||||
@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
* @Date: 2023/7/9 10:21
|
||||
* @Description :
|
||||
*/
|
||||
@ServerEndpoint(value = "/admin-api/websocket/rescueDriver/{driverId}")
|
||||
@ServerEndpoint(value = "/websocket/rescueDriver/{driverId}")
|
||||
@Component
|
||||
public class RescueDriverSocket {
|
||||
private final static Logger log = LoggerFactory.getLogger(RescueDriverSocket.class);
|
||||
|
||||
@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.rescue.controller.admin;
|
||||
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
|
||||
import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
|
||||
import cn.iocoder.yudao.module.rescue.domain.RescueInfo;
|
||||
import cn.iocoder.yudao.module.rescue.service.IRescueOrderInfoService;
|
||||
@ -28,6 +29,7 @@ public class RescuePayController extends BaseController {
|
||||
}
|
||||
// @ApiOperation(value = "支付回调", notes = "支付回调")
|
||||
@PostMapping("/payNotify")
|
||||
@TenantIgnore
|
||||
public Map<String, String> payNotify(@RequestBody JSONObject jsonObject) {
|
||||
return rescueOrderInfoService.payNotify(jsonObject);
|
||||
}
|
||||
|
||||
@ -148,7 +148,7 @@ public class YudaoWebSecurityConfigurerAdapter {
|
||||
.antMatchers("/userClient/pay/**").permitAll()
|
||||
.antMatchers("/userClient/weChat/**","/userClient/repair/wxLogin").permitAll()
|
||||
.antMatchers("/admin-api/websocket/**").permitAll()
|
||||
.antMatchers("/websocket/**").permitAll()
|
||||
.antMatchers("/websocket/**","/admin-api/payApi/payNotify","/admin-api/rescuePayApi/payNotify").permitAll()
|
||||
// 小程序首页
|
||||
.antMatchers("/admin-api/system/notice/listWx","/admin-api/system/swiper/listWx","/admin-api/system/shopconfig/listWx").permitAll()
|
||||
// 蓝安救援
|
||||
|
||||
@ -235,6 +235,8 @@ yudao:
|
||||
- /userClient/base/company/page #查询可提供服务的子公司，不需要登录
|
||||
- /userClient/base/company/get #查询可提供服务的子公司详情，不需要登录
|
||||
- /admin-api/rescue/driverLogin
|
||||
- /admin-api/rescuePayApi/payNotify
|
||||
- /admin-api/payApi/payNotify
|
||||
websocket:
|
||||
enable: true # websocket的开关
|
||||
path: /infra/ws # 路径
|
||||
@ -292,6 +294,8 @@ yudao:
|
||||
- /userClient/**
|
||||
- /admin-api/ueditor/**
|
||||
- /admin-api/rescue/driverLogin
|
||||
- /admin-api/rescuePayApi/payNotify
|
||||
- /admin-api/payApi/payNotify
|
||||
|
||||
ignore-tables:
|
||||
- system_tenant
|
||||
|
||||
Loading…
Reference in New Issue
Block a user