Browse Source

5月14日排序修改,消费网号校验

sjb
Your Name 3 days ago
parent
commit
9eea1134f1
  1. 6
      src/main/java/com/example/demo/controller/DetailYController.java
  2. 3
      src/main/java/com/example/demo/controller/RechargeController.java
  3. 6
      src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
  4. 2
      src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
  5. 4
      src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java

6
src/main/java/com/example/demo/controller/DetailYController.java

@ -5,6 +5,7 @@ import com.example.demo.domain.entity.Detail;
import com.example.demo.domain.entity.DetailY;
import com.example.demo.domain.entity.UserDetailExport;
import com.example.demo.domain.vo.*;
import com.example.demo.serviceImpl.DetailYServiceImpl;
import com.example.demo.sevice.DetailService;
import com.example.demo.sevice.DetailYService;
//import com.example.demo.sevice.OtherService;
@ -24,7 +25,7 @@ import java.util.List;
@Slf4j
@CrossOrigin
public class DetailYController {
private final DetailYService detailYService;
private final DetailYServiceImpl detailYService;
private final OtherService otherService;
@PostMapping("/add")
public Result add(@RequestBody DetailY detailY) {
@ -42,6 +43,9 @@ public class DetailYController {
return Result.success(detailYService.getCount(page.getDetailY()));
}
else {
System.out.println(page.getPageNum());
System.out.println(page.getPageSize());
System.out.println(page.getDetailY().getSortField());
return Result.success(detailYService.getDetailByPage(page.getPageNum(), page.getPageSize(), page.getDetailY()));
}
}

3
src/main/java/com/example/demo/controller/RechargeController.java

@ -5,6 +5,7 @@ import com.example.demo.domain.vo.Page;
import com.example.demo.domain.vo.RechargeA;
import com.example.demo.domain.vo.Result;
//import com.example.demo.controller.KafkaProducer;
import com.example.demo.serviceImpl.RechargeServiceImpl;
import com.example.demo.sevice.RechargeService;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.ObjectMapper;
@ -29,7 +30,7 @@ import java.util.stream.Collectors;
@JsonIgnoreProperties(ignoreUnknown = true)
public class RechargeController {
private final RechargeService rechargeService;
private final RechargeServiceImpl rechargeService;
private final ObjectMapper objectMapper; // 添加这一行
// @Autowired
// private KafkaProducer kafkaProducer;

6
src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@ -18,6 +18,7 @@ import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.math.BigDecimal;
import java.time.LocalDate;
@ -38,7 +39,10 @@ public class ConsumeServiceImpl implements ConsumeService {
@Override
//新增消费记录
public int insert(DetailY detailY) throws Exception {
User sUser = userMapper.select(detailY.getJwcode());
if(ObjectUtils.isEmpty(sUser)){
throw new Exception("无此精网号");
}
// 生成UUID作为订单编号
String uuid = UUID.randomUUID().toString().replace("-", ""); // 去掉UUID中的'-'
detailY.setOrderCode(uuid);

2
src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java

@ -48,7 +48,7 @@ public class DetailYServiceImpl implements DetailYService {
}
@Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + #detailY.hashCode()")
// @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + #detailY.hashCode()")
@Override
public PageInfo<DetailY> getDetailByPage(int pageNum, int pageSize, DetailY detailY) {
if(detailY.getNum()!=null) {

4
src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java

@ -144,9 +144,11 @@ public class RechargeServiceImpl implements RechargeService {
public List<RechargeVo> search(RechargeVo rechargeVo) {
return rechargeMapper.select(rechargeVo);
}
@Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #rechargeVo.hashCode() ")
// @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #rechargeVo.hashCode() ")
@Override
public PageInfo<RechargeVo> searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo) {
System.out.println(rechargeVo.getSortOrder());
System.out.println(rechargeVo.getSortField());
PageHelper.startPage(pageNum, pageSize);
List<RechargeVo> list= rechargeMapper.select(rechargeVo);
return new PageInfo<>(list);

Loading…
Cancel
Save