Commit 46909baf authored by 罗林杰's avatar 罗林杰

完善退单

parent fb914e68
...@@ -26,7 +26,7 @@ public class CustRecharge extends CyIdIncreEntity<CustRecharge> { ...@@ -26,7 +26,7 @@ public class CustRecharge extends CyIdIncreEntity<CustRecharge> {
* @default * @default
*/ */
@Excel(name = "客户", orderNum = "0", width = 20) @Excel(name = "客户", orderNum = "0", width = 20)
private String customerId; private Integer customerId;
/** /**
* @desc 实际充值 * @desc 实际充值
......
...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.rcisoft.bean.AdminProperties; import org.rcisoft.bean.AdminProperties;
import org.rcisoft.bus.custinfo.entity.CustInfo;
import org.rcisoft.bus.custinfo.service.CustInfoService;
import org.rcisoft.core.util.CyUserUtil; import org.rcisoft.core.util.CyUserUtil;
import org.rcisoft.core.aop.CyPageUtilAsp; import org.rcisoft.core.aop.CyPageUtilAsp;
import org.rcisoft.core.model.CyPersistModel; import org.rcisoft.core.model.CyPersistModel;
...@@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Propagation; ...@@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.rcisoft.core.model.CyPageInfo; import org.rcisoft.core.model.CyPageInfo;
import java.math.BigDecimal;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
...@@ -42,6 +45,9 @@ public class CustRechargeServiceImpl extends ServiceImpl<CustRechargeRepository, ...@@ -42,6 +45,9 @@ public class CustRechargeServiceImpl extends ServiceImpl<CustRechargeRepository,
@Autowired @Autowired
protected AdminProperties adminProperties; protected AdminProperties adminProperties;
@Autowired
CustInfoService custInfoServiceImpl;
/** /**
* 保存 客户消费表 * 保存 客户消费表
* @param custRecharge * @param custRecharge
...@@ -50,6 +56,16 @@ public class CustRechargeServiceImpl extends ServiceImpl<CustRechargeRepository, ...@@ -50,6 +56,16 @@ public class CustRechargeServiceImpl extends ServiceImpl<CustRechargeRepository,
@Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT) @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
@Override @Override
public CyPersistModel persist(CustRecharge custRecharge){ public CyPersistModel persist(CustRecharge custRecharge){
if(custRecharge.getOrderNumber() != null){
custRecharge.setStoreId(CyUserUtil.getAuthenDept());
//根据id修改余额
CustInfo custInfo = custInfoServiceImpl.findById(custRecharge.getCustomerId());
BigDecimal newBalance = custInfo.getCustomerBalance().subtract(custRecharge.getConsumptionAmount());
custInfo.setCustomerBalance(newBalance);
custInfoServiceImpl.merge(custInfo);
}
//增加操作 //增加操作
int line = baseMapper.insert(custRecharge); int line = baseMapper.insert(custRecharge);
log.debug(CyUserUtil.getAuthenUsername()+"新增了ID为"+ log.debug(CyUserUtil.getAuthenUsername()+"新增了ID为"+
......
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.rcisoft.bean.AdminProperties; import org.rcisoft.bean.AdminProperties;
import org.rcisoft.bus.custrecharge.entity.CustRecharge;
import org.rcisoft.bus.storegoodsapply.dao.StoreGoodsApplyRepository; import org.rcisoft.bus.storegoodsapply.dao.StoreGoodsApplyRepository;
import org.rcisoft.bus.storegoodsapply.dto.AddStoreGoodsApplyDTO; import org.rcisoft.bus.storegoodsapply.dto.AddStoreGoodsApplyDTO;
import org.rcisoft.bus.storegoodsapply.entity.StoreGoodsApply; import org.rcisoft.bus.storegoodsapply.entity.StoreGoodsApply;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment