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

Merge pull request 'test合并到master 20230703' (#20) from test into master 

Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/20
master
TanGH 2023-07-03 17:54:52 +08:00
parent 1c0376f60c acc88820e5
commit 81e3a97a42
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.pay.properties.WxPayProperties;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; 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.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.response.member.InitOrderResponse;
import cn.iocoder.yudao.module.shop.utils.OrderUtil; import cn.iocoder.yudao.module.shop.utils.OrderUtil;
import cn.iocoder.yudao.module.system.api.tenant.TenantApi; import cn.iocoder.yudao.module.system.api.tenant.TenantApi;
@ -42,6 +43,9 @@ public class WxPayStrategy implements IPayStrategy{
@Autowired @Autowired
private TenantApi tenantApi; private TenantApi tenantApi;
@Autowired
private RechargeOrderMapper rechargeOrderMapper;
@Override @Override
public InitOrderResponse pay(RechargeOrderDO orderDO, HttpServletRequest servletRequest,String openid) { public InitOrderResponse pay(RechargeOrderDO orderDO, HttpServletRequest servletRequest,String openid) {
Long requiredTenantId = TenantContextHolder.getRequiredTenantId(); Long requiredTenantId = TenantContextHolder.getRequiredTenantId();
@ -90,6 +94,10 @@ public class WxPayStrategy implements IPayStrategy{
log.info("退款回调[{}]", JSONUtil.toJsonPrettyStr(wxPayRefundV3Request)); log.info("退款回调[{}]", JSONUtil.toJsonPrettyStr(wxPayRefundV3Request));
}catch (Exception e){ }catch (Exception e){
log.error(e.getMessage(),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()); deptMapper.updateBatch(deptDOS, deptDOS.size());
deptDO.setName(reqVO.getName()); deptDO.setName(reqVO.getName());
deptDO.setParentOrganizationName(reqVO.getName()); DeptDO parentDeptDO = deptMapper.selectById(deptDO.getParentId());
deptDO.setParentOrganizationName(parentDeptDO.getParentOrganizationName() + ">" + reqVO.getName());
deptMapper.updateById(deptDO); deptMapper.updateById(deptDO);
// 发送刷新消息 // 发送刷新消息
deptProducer.sendDeptRefreshMessage(); deptProducer.sendDeptRefreshMessage();

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

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