瀏覽代碼

fix

release_toaliyun_real
winter 1 年之前
父節點
當前提交
bd63839391
共有 4 個檔案被更改,包括 46 行新增2 行删除
  1. +11
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java
  2. +28
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxEnergyService.java
  4. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java

+ 11
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java 查看文件

@@ -611,6 +611,17 @@ public class WxEnergyController extends BaseController {
@PostMapping("createReadingCalcute") @PostMapping("createReadingCalcute")
public ResultData createReadingCalcute(@RequestBody WxEnergyReadingCalcute record) { public ResultData createReadingCalcute(@RequestBody WxEnergyReadingCalcute record) {
record.updateTenantInfo(getTenantInfo()); record.updateTenantInfo(getTenantInfo());
//如果已经存在则不允许
WxEnergyReadingCalcute rcq = new WxEnergyReadingCalcute();
rcq.updateTenantInfo(record);
rcq.setPeriod(record.getPeriod());
rcq.setFeesId(record.getFeesId());
rcq.setIsDel(EnumYesOrNo.NO.getCode());
rcq.setShopIds(record.getShopIds());
List<WxEnergyReadingCalcute> rcList = wxEnergyService.findCalcuteList(rcq);
if (null != rcList && rcList.size() > 0 ) {
return new ResultData(Result.ERROR,"已存在重复数据");
}
wxEnergyService.saveOrUpdateReadingCalcute(record,this.getUser()); wxEnergyService.saveOrUpdateReadingCalcute(record,this.getUser());
return new ResultData(); return new ResultData();
} }


+ 28
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java 查看文件

@@ -15,7 +15,9 @@ import com.iformall.domain.po.WxAllBill;
import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillAction;
import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxCouponOrder;
import com.iformall.domain.po.WxEnergyFeesTime; import com.iformall.domain.po.WxEnergyFeesTime;
import com.iformall.domain.po.WxEnergyMeter;
import com.iformall.domain.po.WxEnergyMeterReading; import com.iformall.domain.po.WxEnergyMeterReading;
import com.iformall.domain.po.WxEnergyMeterShopFloor;
import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowModel;
import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallBuilding;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
@@ -34,6 +36,7 @@ import com.iformall.enums.EnumBillOweOrNearType;
import com.iformall.enums.EnumBillUpdateType; import com.iformall.enums.EnumBillUpdateType;
import com.iformall.enums.EnumCouponOrderStatus; import com.iformall.enums.EnumCouponOrderStatus;
import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponType;
import com.iformall.enums.EnumEnergyMeterShopFloorType;
import com.iformall.enums.EnumEnergyMeterType; import com.iformall.enums.EnumEnergyMeterType;
import com.iformall.enums.EnumFilterSettle; import com.iformall.enums.EnumFilterSettle;
import com.iformall.enums.EnumFlowKey; import com.iformall.enums.EnumFlowKey;
@@ -379,13 +382,36 @@ public class WxMallAdminController extends BaseController {
} }
@ApiOperation("抄表数据分页列表接口") @ApiOperation("抄表数据分页列表接口")
@GetMapping("readingList")
@GetMapping("shopMeterList")
public ResultData shopMeterList(@ModelAttribute WxEnergyMeter record) {
record.setIsDel(EnumYesOrNo.NO.getCode());
setQueryDataRule(record);
WxEnergyMeterShopFloor sfq = new WxEnergyMeterShopFloor();
sfq.updateTenantInfo(record);
sfq.setType(EnumEnergyMeterShopFloorType.SHOP.getCode());
sfq.setAliseId(record.getShopId());
List<Long> mids = wxEnergyService.getMeterIdList(sfq);
if (null == mids || mids.size() <= 0 ) {
return new ResultData();
}
record.setIds(mids);
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxEnergyMeter> page = wxEnergyService.meterListAsPage(record, 1, 1000);
return new ResultData(page);
}
@ApiOperation("抄表数据分页列表接口")
@GetMapping("preShopReadingList")
public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) { public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) {
record.setIsDel(EnumYesOrNo.NO.getCode()); record.setIsDel(EnumYesOrNo.NO.getCode());
setQueryDataRule(record); setQueryDataRule(record);
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxEnergyMeterReading> page = wxEnergyService.readingListAsPage(record, 1, 1000); PageInfo<WxEnergyMeterReading> page = wxEnergyService.readingListAsPage(record, 1, 1000);
return new ResultData(page);
if (null != page && null != page.getList() && page.getList().size() > 0 ) {
return new ResultData(page.getList().get(0));
}
return new ResultData();
} }
//能源抄表费用 //能源抄表费用


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxEnergyService.java 查看文件

@@ -77,6 +77,7 @@ public interface WxEnergyService {
//抄表科目计算数据 //抄表科目计算数据
PageInfo<WxEnergyReadingCalcute> readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize); PageInfo<WxEnergyReadingCalcute> readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize);
List<WxEnergyReadingCalcute> findCalcuteList(WxEnergyReadingCalcute record);
void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record,MallUserInfo userInfo); void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record,MallUserInfo userInfo);
PageInfo<WxEnergyReadingCalcuteResult> readingCalcuteResultListAsPage(WxEnergyReadingCalcuteResult record, Integer pageIndex, Integer pageSize); PageInfo<WxEnergyReadingCalcuteResult> readingCalcuteResultListAsPage(WxEnergyReadingCalcuteResult record, Integer pageIndex, Integer pageSize);
void exportReadingCalcuteResult(WxEnergyReadingCalcuteResult record,HttpServletRequest request, HttpServletResponse response); void exportReadingCalcuteResult(WxEnergyReadingCalcuteResult record,HttpServletRequest request, HttpServletResponse response);


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java 查看文件

@@ -879,7 +879,13 @@ public class WxEnergyServiceImpl implements WxEnergyService {
} }
return page; return page;
} }
@Override
public List<WxEnergyReadingCalcute> findCalcuteList(WxEnergyReadingCalcute record) {
return wxEnergyReadingCalcuteMapper.findList(record);
}


@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override @Override
public void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record, MallUserInfo userInfo) { public void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record, MallUserInfo userInfo) {
Date date = new Date(); Date date = new Date();


Loading…
取消
儲存