yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改支付充值，充电完成自动退款

Browse Source
This commit is contained in:
yuyang 2022-02-23 18:31:41 +08:00
parent bf8f19df85
commit 0e175e8cd0
11 changed files with 99 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcRechargeOrder.java
View File

@ -64,6 +64,8 @@ public class XhpcRechargeOrder extends BaseEntity {
*/
private Integer source;
private String tenantId;
public Long getRechargeOrderId() {
return rechargeOrderId;
}
@ -143,4 +145,14 @@ public class XhpcRechargeOrder extends BaseEntity {
public void setSource(Integer source) {
this.source = source;
}
@Override
public String getTenantId() {
return tenantId;
}
@Override
public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}
}

10
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/util/UserTypeUtil.java
View File

@ -101,4 +101,14 @@ public class UserTypeUtil {
public static final Long SYS_USER_TYPE_ADMIN = 1L;
/**
* 登录状态
*/
public static final String LOGIN = "1";
/**
* 未登录状态
*/
public static final String NO_LOGIN = "0";
}

32
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -637,21 +637,6 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
executorService.execute(new Runnable() {
@Override
public void run() {
try{
//充电结算后自动申请退款
if(userMessage !=null && "1".equals(userMessage.get("isRefund").toString()) && map !=null){
logger.info("<<<<<<<<<<<<<<<<进入自动退款111>>>>>>>>>>>>>>>>>");
if(UserTypeUtil.CHARGING_MODE_WX.equals(xhpcChargeOrder.getChargingMode()) ||UserTypeUtil.CHARGING_MODE_ZFB.equals(xhpcChargeOrder.getChargingMode()) ){
if(UserTypeUtil.USER_TYPE.equals(source) || UserTypeUtil.COMMUNIT_TYPE.equals(source)){
logger.info("<<<<<<<<<<<<<<<<进入自动退款222>>>>>>>>>>>>>>>>>");
refundOrderService.sendNotice(balance2,openids,xhpcChargeOrder.getSource(),refundTypes,xhpcChargeOrder.getUserId().toString(),xhpcChargeOrder.getTenantId(),"充电结算自动申请退款");
}
}
}
}catch (Exception e){
e.printStackTrace();
logger.info("<<<<<<<<<<<<<<<<自动退款失败>>>>>>>>>>>>>>>>>");
}
try{
logger.info("<<<<<<<<<<<<<<<<进行入短信发送>>>>>>>>>>>>>>>>>");
if(!UserTypeUtil.INTERNET_TYPE.equals(source)){
@ -688,6 +673,21 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
logger.info("<<<<<<<<<<<<<<<<发送短信失败>>>>>>>>>>>>>>>>>");
}
addPileEndOrder(xhpcHistoryOrder, xhpcChargeOrder, xhpcChargeOrder.getSerialNumber(),1);
try{
//充电结算后自动申请退款
if(userMessage !=null && "1".equals(userMessage.get("isRefund").toString()) && map !=null){
logger.info("<<<<<<<<<<<<<<<<进入自动退款111>>>>>>>>>>>>>>>>>");
if(UserTypeUtil.CHARGING_MODE_WX.equals(xhpcChargeOrder.getChargingMode()) ||UserTypeUtil.CHARGING_MODE_ZFB.equals(xhpcChargeOrder.getChargingMode()) ){
if(UserTypeUtil.USER_TYPE.equals(source) || UserTypeUtil.COMMUNIT_TYPE.equals(source)){
logger.info("<<<<<<<<<<<<<<<<进入自动退款222>>>>>>>>>>>>>>>>>");
refundOrderService.sendNotice(balance2,openids,xhpcChargeOrder.getSource(),refundTypes,xhpcChargeOrder.getUserId().toString(),xhpcChargeOrder.getTenantId(),"充电结算自动申请退款");
}
}
}
}catch (Exception e){
e.printStackTrace();
logger.info("<<<<<<<<<<<<<<<<自动退款失败>>>>>>>>>>>>>>>>>");
}
}
});
}catch (Exception e){
@ -767,6 +767,8 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
logger.info("<<<<<<<<<<<<<<<<订单结束回调成功>>>>>>>>>订单号：>>>"+orderNo+">>>>>");
logger.info("<<<<<<<<<<<<<<<<订单结束回调成功>>>>>>>>>订单号：>>>"+orderNo+">>>>>>>>");
logger.info("<<<<<<<<<<<<<<<<订单结束回调成功>>>>>>>>>订单号：>>>"+orderNo+">>>>>>>>");
}

7
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java
View File

@ -38,6 +38,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -58,6 +59,8 @@ import java.util.Set;
@Api(value = "支付宝支付接口", tags = "支付宝支付接口")
public class AlipayPaymentController {
@Autowired
private Environment environment;
@Autowired
private IXhpcRechargeOrderService iXhpcRechargeOrderService;
@Autowired
@ -79,7 +82,7 @@ public class AlipayPaymentController {
@NoRepeatSubmit
@PostMapping("/payment")
@ApiOperation(value = "支付宝支付")
private AjaxResult payment(HttpServletRequest servletRequest, @RequestBody Map<String, Object> map) throws Exception {
public AjaxResult payment(HttpServletRequest servletRequest, @RequestBody Map<String, Object> map) throws Exception {
String openid = StringUtils.valueOf(map.get("openid"));
if (StringUtils.isEmpty(openid)) {
return AjaxResult.error(HttpStatus.NOT_NULL, "openid不能为空");
@ -185,7 +188,7 @@ public class AlipayPaymentController {
if(xhpcRechargeOrder!=null){
XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_ALI_PAY_TYPE, xhpcRechargeOrder.getTenantId());
if(xhpcSettingConfig !=null){
String publiccertpath = getAlipayPublicKey(xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa());
String publiccertpath = getAlipayPublicKey(environment.getProperty("PUBLICCERTPATH"));
logger.info("<<<<<<<<<<<<支付宝公钥证书>>>>>>>>>"+publiccertpath);
// 调用SDK验证签名
boolean signVerified = AlipaySignature.rsaCheckV1(params, publiccertpath, "utf-8", "RSA2");

5
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java
View File

@ -197,10 +197,6 @@ public class XhpcRefundOrderController extends BaseController {
}
//是否有实时数据
Long userid = Long.valueOf(userId);
int i = iXhpcRefundOrderService.countXhpcRealTimeOrder(userid, source, tenantId);
if (i > 0) {
return R.fail("车辆正在充电,不能退款");
}
// 是否有异常订单
int j = iXhpcRefundOrderService.countXhpcChargeOrder(userid, source, tenantId);
if (j > 0) {
@ -210,7 +206,6 @@ public class XhpcRefundOrderController extends BaseController {
String orderOutNumber = StringUtils.numFormat(userid, Integer.parseInt(type),
StatusConstants.FLOWING_WATER_REFUND_TYPE);
logger.info("<<<<<<<<<<<<<<<<开始创建退款订单>>>>>>>>>>>>>>>>>");
AjaxResult ajaxResult = iXhpcRefundOrderService.addRefundOrder("" + userid, BigDecimal.valueOf(Double.parseDouble(amount)), type,
orderOutNumber, openid, remark, source, tenantId);
if("200".equals(ajaxResult.get("code"))){

14
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcSettingConfigImpl.java
View File

@ -3,6 +3,7 @@ package com.xhpc.payment.service.impl;
import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.utils.SecurityUtils;
import com.xhpc.common.domain.XhpcSettingConfig;
import com.xhpc.common.security.service.TokenService;
import com.xhpc.common.util.LogUserUtils;
import com.xhpc.common.util.UserTypeUtil;
import com.xhpc.payment.mapper.XhpcSettingConfigMapper;
@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.security.DenyAll;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -28,6 +30,8 @@ public class XhpcSettingConfigImpl implements IXhpcSettingConfigService {
private XhpcSettingConfigMapper xhpcSettingConfigMapper;
@Autowired
private LogUserUtils logUserUtils;
@Autowired
private TokenService tokenService;
@Override
public R insertXhpcSettingConfig(XhpcSettingConfig xhpcSettingConfig) {
@ -50,11 +54,11 @@ public class XhpcSettingConfigImpl implements IXhpcSettingConfigService {
@Override
public Map<String,Object> getXhpcSettingConfigStatus(HttpServletRequest request, Integer status) {
//获取登陆用户
Long userId = SecurityUtils.getUserId();
//桩的统计、该时段金额
LoginUser logUser = logUserUtils.getLogUser(request);
String tenantId = logUser.getSysUser().getTenantId();
LoginUser logUser = tokenService.getLoginUser(request);
if(logUser==null){
return new HashMap<>();
}
String tenantId = logUser.getTenantId();
return xhpcSettingConfigMapper.getXhpcSettingConfigStatus(status,tenantId);
}
}

5
xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
View File

@ -20,6 +20,7 @@
<result column="update_by" property="updateBy" />
<result column="remark" property="remark" />
<result column="source" property="source" />
<result column="tenant_id" property="tenantId" />
</resultMap>
<insert id="insert" parameterType="com.xhpc.common.domain.XhpcRechargeOrder" useGeneratedKeys="true"
@ -245,8 +246,8 @@
<select id="infoRechargeOrderNumber" parameterType="java.lang.String" resultMap="XhpcRechargeOrderResult">
select *
from xhpc_recharge_order xro
where xro.del_flag = 0 and xro.recharge_order_number = #{rechargeOrderNumber}
from xhpc_recharge_order
where del_flag = 0 and recharge_order_number = #{rechargeOrderNumber}
</select>

7
xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcSettingConfigMapper.xml
View File

@ -155,7 +155,6 @@
<update id="updateXhpcSettingConfig" parameterType="com.xhpc.common.domain.XhpcSettingConfig">
UPDATE xhpc_setting_config
<set>
<if test="null != wxAppId and '' != wxAppId">
wx_app_id =#{wxAppId},
</if>
@ -217,9 +216,10 @@
WHERE setting_config_id = #{settingConfigId}
</update>
<select id="getXhpcSettingConfigStatus" parameterType="java.lang.Long" resultType="java.util.Map">
<select id="getXhpcSettingConfigStatus" resultType="java.util.Map">
select
setting_config_id as settingConfigId,
<if test="status==1">
wx_app_id as wxAppId,
wx_app_secret as wxAppSecret,
wx_mch_id as wxMchId,
@ -230,6 +230,8 @@
concat("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png") as wxApiclientCertPem,
concat("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png") as wxApiclientKeyPem,
concat("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png") as wxAppCertPublicKey,
</if>
<if test="status==2">
zfb_app_id as zfbAppId,
zfb_private_key as zfbPrivateKey,
zfb_callback_url as zfbCallbackUrl,
@ -237,6 +239,7 @@
concat("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png") as zfbAlipayCertPublicKeyRsa,
concat("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png") as zfbAlipayRootCert,
zhb_server_url as zhbServerUrl,
</if>
status as status,
del_flag as delFlag,
tenant_id as tenantId

7
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcAppUserMapper.java
View File

@ -100,4 +100,11 @@ public interface XhpcAppUserMapper {
* @return
*/
Map<String, Object> getUserLoginTime(@Param("type")Integer type,@Param("openid")String openid,@Param("tenantId")String tenantId);
/**
* 该账号之前的登录信息，进行退出操作
* @param account
* @return
*/
int updateUserLoginTime(@Param("account")String account);
}

10
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
View File

@ -264,6 +264,8 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
xhpcAppUserMapper.updateCustomersPersonnel(appUserId,null,openid,null,UserConstants.LOGIN);
}
}
//去退出账号之前登录的信息
xhpcAppUserMapper.updateUserLoginTime(username);
//添加最后一次登录数据
xhpcAppUserMapper.addUserLoginTime(appUserId,username,userInfo.getUserType(),openid,Integer.valueOf(type),null,tenantId,new Date());
@ -327,6 +329,8 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
}
xhpcAppUserMapper.update(user);
redisService.deleteObject("pvToken:" + user.getPhone());
//去退出账号之前登录的信息
xhpcAppUserMapper.updateUserLoginTime(username);
//添加最后一次登录数据
xhpcAppUserMapper.addUserLoginTime(user.getAppUserId(),username,userInfo.getUserType(),openid,Integer.valueOf(type),UserConstants.LOGIN,tenantId,new Date());
// 获取登录token
@ -403,9 +407,13 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU
if(userLoginTime ==null){
return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
}
if(UserConstants.NO_LOGIN.equals(userLoginTime.get("status").toString())){
logger.info("-------userLoginTime---"+userLoginTime.toString());
if(userLoginTime.get("status") == null){
return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
} else if(UserTypeUtil.NO_LOGIN.equals(userLoginTime.get("status").toString())){
return R.fail(HttpStatus.USER_LOGIN, "请重新登录");
}
logger.info("-------status---"+userLoginTime.get("status").toString());
return appLogin(userLoginTime.get("account").toString(), type, openid, tenantId);
}

4
xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
View File

@ -347,4 +347,8 @@
order by create_time desc
limit 1
</select>
<update id="updateUserLoginTime">
update xhpc_user_login set status =0 where account=#{account} and status=1
</update>
</mapper>