zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test合并到master 20230703 #20

Merged
TanGH merged 6 commits from test into master 2023-07-03 17:54:52 +08:00
Conversation 0 Commits 6 Files Changed 3
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/support/pay/WxPayStrategy.java
View File

@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.pay.config.WxPayOneAutoConfiguration;
import cn.iocoder.yudao.framework.pay.properties.WxPayProperties;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO;
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderMapper;
import cn.iocoder.yudao.module.shop.response.member.InitOrderResponse;
import cn.iocoder.yudao.module.shop.utils.OrderUtil;
import cn.iocoder.yudao.module.system.api.tenant.TenantApi;
@ -42,6 +43,9 @@ public class WxPayStrategy implements IPayStrategy{
@Autowired
private TenantApi tenantApi;
@Autowired
private RechargeOrderMapper rechargeOrderMapper;
@Override
public InitOrderResponse pay(RechargeOrderDO orderDO, HttpServletRequest servletRequest,String openid) {
Long requiredTenantId = TenantContextHolder.getRequiredTenantId();
@ -90,6 +94,10 @@ public class WxPayStrategy implements IPayStrategy{
log.info("退款回调[{}]", JSONUtil.toJsonPrettyStr(wxPayRefundV3Request));
}catch (Exception e){
log.error(e.getMessage(),e);
// 退款异常后将充值订单状态重置为未退款（维护阶段，暂不考虑优化代码）
orderDO.setRefundStatus(0);
rechargeOrderMapper.updateById(orderDO);
}
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
View File

@ -149,7 +149,8 @@ public class DeptServiceImpl implements DeptService {
});
deptMapper.updateBatch(deptDOS, deptDOS.size());
deptDO.setName(reqVO.getName());
deptDO.setParentOrganizationName(reqVO.getName());
DeptDO parentDeptDO = deptMapper.selectById(deptDO.getParentId());
deptDO.setParentOrganizationName(parentDeptDO.getParentOrganizationName() + ">" + reqVO.getName());
deptMapper.updateById(deptDO);
// 发送刷新消息
deptProducer.sendDeptRefreshMessage();

2
yudao-ui-admin/src/views/system/dept/index.vue
View File

@ -347,7 +347,7 @@ export default {
if (valid) {
if (this.form.id !== undefined) {
updateDept(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess("组织名称修改成功（其他选项暂不支持修改）");
this.open = false;
this.getList();
});