From a06b3e165297c90b974cf5e516912873ae827d00 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Wed, 13 Jan 2021 21:28:47 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/mapper/SysProjUseMapper.java | 4 ++++ zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysProjUseMapper.java b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysProjUseMapper.java index 79afc52..0bbf9f3 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysProjUseMapper.java +++ b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysProjUseMapper.java @@ -3,6 +3,7 @@ import com.matrix.system.app.vo.ServiceProjVo; import com.matrix.system.app.vo.ServiceTcVo; import com.matrix.system.hive.bean.SysProjUse; +import com.matrix.system.hive.bean.SysProjUseFlow; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; @@ -30,4 +31,7 @@ public abstract ServiceProjVo entityToServiceProjVo(SysProjUse sysProjUse); public abstract List<ServiceProjVo> entityListToProjVoList(List<SysProjUse> list); + + @Mapping(source = "id", target = "projUseId") + public abstract SysProjUseFlow projUseToFlow(SysProjUse sysProjUse); } diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java index 4a5ebcc..34f2853 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.WebUtil; import com.matrix.system.app.dto.OrderListDto; +import com.matrix.system.app.mapper.SysProjUseMapper; import com.matrix.system.app.vo.OrderDetailAchieveItemVo; import com.matrix.system.app.vo.OrderDetailItemVo; import com.matrix.system.app.vo.OrderDetailVo; @@ -105,6 +106,7 @@ @Autowired private SysInstoreInfoService sysInstoreInfoService; + @Override public int add(SysOrder sysOrder) { @@ -1241,7 +1243,7 @@ @Transactional(rollbackFor = Exception.class) @Override public void refundOrderMoney(SysOrder pageOrder) { - + SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); // 插入订单流水 changeOrderStatu(pageOrder); @@ -1269,6 +1271,13 @@ sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX); } sysProjUseDao.update(sysProjUse); + + SysProjUseFlow sysProjUseFlow = SysProjUseMapper.INSTANCE.projUseToFlow(sysProjUse); + sysProjUseFlow.setOptionType("退款修改"); + sysProjUseFlow.setId(null); + sysProjUseFlow.setUpdateBy(user.getSuName()); + sysProjUseFlow.setCreateBy(user.getSuName()); + sysProjUseDao.insertFlow(sysProjUseFlow); } } @@ -1285,6 +1294,12 @@ sysProjUse.setStatus(Dictionary.TAOCAN_STATUS_WX); sysProjUseDao.update(sysProjUse); + SysProjUseFlow sysProjUseFlow = SysProjUseMapper.INSTANCE.projUseToFlow(sysProjUse); + sysProjUseFlow.setOptionType("退款修改"); + sysProjUseFlow.setId(null); + sysProjUseFlow.setUpdateBy(user.getSuName()); + sysProjUseFlow.setCreateBy(user.getSuName()); + sysProjUseDao.insertFlow(sysProjUseFlow); } } -- Gitblit v1.9.1