Przeglądaj źródła

[电表管理][修改][添加商户电表设置]

release_toaliyun_real
gongbiao 6 lat temu
rodzic
commit
2db54f1292
2 zmienionych plików z 23 dodań i 0 usunięć
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +18
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java

+ 5
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Wyświetl plik

@@ -494,6 +494,11 @@ public enum ErrorCode{
*/ */
PICTURE_SIZE_EXCEED(40001, "图片超过2M限制"), PICTURE_SIZE_EXCEED(40001, "图片超过2M限制"),


/**
* 电费生成配置
*/
POWER_BILL_CONFIGU_NOT_FOUND(50001, "未配置电费账单生成规则"),



; ;




+ 18
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java Wyświetl plik

@@ -7,8 +7,11 @@ import com.iformall.common.IdWorker;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantPowerBillConfig; import com.iformall.domain.po.WxMerchantPowerBillConfig;
import com.iformall.domain.po.WxPowerBillAutoConfig;
import com.iformall.enums.EnumPowerBillBuildWay;
import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxMerchantMapper;
import com.iformall.mapper.WxMerchantPowerBillConfigMapper; import com.iformall.mapper.WxMerchantPowerBillConfigMapper;
import com.iformall.mapper.WxPowerBillAutoConfigMapper;
import com.iformall.service.WxMerchantPowerBillConfigService; import com.iformall.service.WxMerchantPowerBillConfigService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -34,6 +37,10 @@ public class WxMerchantPowerBillConfigServiceImpl implements WxMerchantPowerBill
@Autowired @Autowired
WxMerchantMapper wxMerchantMapper; WxMerchantMapper wxMerchantMapper;


@Autowired
WxPowerBillAutoConfigMapper wxPowerBillAutoConfigMapper;




@Override @Override
public PageInfo<WxMerchantPowerBillConfig> listAsPage(WxMerchantPowerBillConfig record, Integer pageIndex, Integer pageSize) { public PageInfo<WxMerchantPowerBillConfig> listAsPage(WxMerchantPowerBillConfig record, Integer pageIndex, Integer pageSize) {
@@ -48,8 +55,19 @@ public class WxMerchantPowerBillConfigServiceImpl implements WxMerchantPowerBill
@Override @Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})
public ResultData saveOrUpdate(WxMerchantPowerBillConfig config) { public ResultData saveOrUpdate(WxMerchantPowerBillConfig config) {

Date date = new Date(); Date date = new Date();
if (config.getId() == null) { if (config.getId() == null) {
//按电表计费 从配置中拉取单价
if (config.getBuildWay().equals(EnumPowerBillBuildWay.PRICE.getCode())) {
WxPowerBillAutoConfig wxPowerBillAutoConfig = new WxPowerBillAutoConfig();
wxPowerBillAutoConfig.setTenantId(config.getTenantId());
WxPowerBillAutoConfig powerBillAutoConfig = wxPowerBillAutoConfigMapper.selectOne(wxPowerBillAutoConfig);
if (powerBillAutoConfig == null) {
return new ResultData(ErrorCode.POWER_BILL_CONFIGU_NOT_FOUND);
}
config.setPrice(powerBillAutoConfig.getUnitPrice());
}
WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(config.getMerchantId()); WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(config.getMerchantId());
if (wxMerchant == null) { if (wxMerchant == null) {
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);


Ładowanie…
Anuluj
Zapisz