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-01-25 16:19:23 +08:00
parent 1e8a803dba
commit 83c205402d
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundAuditController.java
View File

@ -263,7 +263,7 @@ public class XhpcRefundAuditController extends BaseController {
Double amount = Double.parseDouble(StringUtils.valueOf(xhpcRefundOrder.get("amount"))); Double amount = Double.parseDouble(StringUtils.valueOf(xhpcRefundOrder.get("amount")));
String amountRefundOrder = "-" + amount.toString(); String amountRefundOrder = "-" + amount.toString();
String tenantId = StringUtils.valueOf(xhpcRefundOrder.get("tenantId")); String tenantId = StringUtils.valueOf(xhpcRefundOrder.get("tenantId"));
XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_WX_TYPE, refundOrder.getTenantId()); XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_WX_TYPE, xhpcRefundOrder.get("tenantId").toString());
if(xhpcSettingConfig ==null){ if(xhpcSettingConfig ==null){
refundOrder.setStatus(2); refundOrder.setStatus(2);
refundOrder.setRemark("订单状态不能退款"); refundOrder.setRemark("订单状态不能退款");
@ -532,7 +532,7 @@ public class XhpcRefundAuditController extends BaseController {
String amountRefundOrder = "-" + money; String amountRefundOrder = "-" + money;
String examineStatus = StringUtils.valueOf(xhpcRefundOrder.get("examineStatus")); String examineStatus = StringUtils.valueOf(xhpcRefundOrder.get("examineStatus"));
String tenantId = StringUtils.valueOf(xhpcRefundOrder.get("tenantId")); String tenantId = StringUtils.valueOf(xhpcRefundOrder.get("tenantId"));
XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_ALI_PAY_TYPE, refundOrder.getTenantId()); XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_ALI_PAY_TYPE,xhpcRefundOrder.get("tenantId").toString());
if(xhpcSettingConfig ==null){ if(xhpcSettingConfig ==null){
refundOrder.setStatus(2); refundOrder.setStatus(2);
refundOrder.setRemark("订单状态不能退款"); refundOrder.setRemark("订单状态不能退款");

17
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOrderServiceImpl.java
View File

@ -142,6 +142,15 @@ public class XhpcRefundOrderServiceImpl implements IXhpcRefundOrderService {
if (null != list && list.size() > 0) { if (null != list && list.size() > 0) {
return AjaxResult.error(HttpStatus.ERROR_STATUS, "还有未完成的订单"); return AjaxResult.error(HttpStatus.ERROR_STATUS, "还有未完成的订单");
} }
Map<String, Object> objectMap = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(appUserId));
if (StringUtils.isNull(objectMap)) {
return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在");
}
String isRefundApplication = StringUtils.valueOf(objectMap.get("isRefundApplication"));
if ("1".equals(isRefundApplication)) {
return AjaxResult.error(HttpStatus.DATA_ERROR, "用户已存在退款订单");
}
R user = userTypeService.getUser(null,userId , userType, null, tenantId); R user = userTypeService.getUser(null,userId , userType, null, tenantId);
if(user !=null && user.getData() !=null){ if(user !=null && user.getData() !=null){
if(!UserTypeUtil.USER_TYPE.equals(userType) && !UserTypeUtil.COMMUNIT_TYPE.equals(userType)){ if(!UserTypeUtil.USER_TYPE.equals(userType) && !UserTypeUtil.COMMUNIT_TYPE.equals(userType)){
@ -156,14 +165,6 @@ public class XhpcRefundOrderServiceImpl implements IXhpcRefundOrderService {
} }
} }
Map<String, Object> objectMap = xhpcUserAccountStatementMapper.appUserInfo(Long.parseLong(appUserId));
if (StringUtils.isNull(objectMap)) {
return AjaxResult.error(HttpStatus.DATA_ERROR, "用户不存在");
}
String isRefundApplication = StringUtils.valueOf(objectMap.get("isRefundApplication"));
if ("1".equals(isRefundApplication)) {
return AjaxResult.error(HttpStatus.DATA_ERROR, "用户已存在退款订单");
}
XhpcRefundOrder xhpcRefundOrder = new XhpcRefundOrder(); XhpcRefundOrder xhpcRefundOrder = new XhpcRefundOrder();
xhpcRefundOrder.setUserId(userId); xhpcRefundOrder.setUserId(userId);
xhpcRefundOrder.setAmount(amount); xhpcRefundOrder.setAmount(amount);

4
xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml
View File

@ -278,8 +278,8 @@
<if test="tenantId !=null and tenantId !=''"> <if test="tenantId !=null and tenantId !=''">
and xco.tenant_id = #{tenantId} and xco.tenant_id = #{tenantId}
</if> </if>
<if test="source !=null"> <if test="userType !=null">
and xco.source = #{source} and xco.source = #{userType}
</if> </if>
ORDER BY xco.create_time DESC ORDER BY xco.create_time DESC
</select> </select>