|
@@ -12,7 +12,9 @@ import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
|
|
|
import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoImageVo;
|
|
|
import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo;
|
|
|
import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
|
|
|
+import com.huimv.farm.damsubsidy.service.IBaseVeterStationService;
|
|
|
import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
|
|
|
+import com.huimv.farm.damsubsidy.service.ISysUserService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
@@ -40,13 +42,18 @@ public class BillBuyInfoController {
|
|
|
private IBillBuyInfoService billBuyInfoService;
|
|
|
@Resource
|
|
|
private BillBuyInfoMapper billBuyInfoMapper;
|
|
|
+ @Resource
|
|
|
+ private ISysUserService sysUserService;
|
|
|
+ @Resource
|
|
|
+ private IBaseVeterStationService baseVeterStationService;
|
|
|
|
|
|
@PostMapping("/listTransaction")
|
|
|
public Result listTransaction(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap){
|
|
|
String pageNum = paramsMap.get("pageNum");
|
|
|
String pageSize = paramsMap.get("pageSize");
|
|
|
String search = paramsMap.get("search");
|
|
|
- String addressCode = TokenSign.getAddressCode(httpServletRequest);
|
|
|
+ Long id = TokenSign.getMemberIdByJwtToken(httpServletRequest);
|
|
|
+ String addressCode = baseVeterStationService.getById(sysUserService.getById(id).getVeterId()).getBriefAddressCode();
|
|
|
Page<BillBuyInfoVo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
|
|
|
Page<BillBuyInfoVo> billBuyInfoPage = billBuyInfoMapper.listTransaction(page,search,addressCode);
|
|
|
Page<BillBuyInfoImageVo> billBuyInfoVoPage = new Page<>();
|