空指针

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -606,12 +606,12 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
 //            }
 //        }
 //        // 积分部分
-        BigDecimal payPrice = orderInfoVo.getProTotalFee().add(priceResponse.getFreightFee()).subtract(priceResponse.getCouponFee());
+//        BigDecimal payPrice = orderInfoVo.getProTotalFee().add(priceResponse.getFreightFee()).subtract(priceResponse.getCouponFee());
         priceResponse.setProTotalFee(orderInfoVo.getProTotalFee());
         // 不使用积分
         priceResponse.setDeductionPrice(BigDecimal.ZERO);
 //            priceResponse.setSurplusIntegral(user.getIntegral());
-        priceResponse.setPayFee(payPrice);
+//        priceResponse.setPayFee(payPrice);
         priceResponse.setUsedIntegral(0);
         return priceResponse;
 //        // 使用积分

mall-service/src/test/resources/generator/template/controller.ftl

@@ -38,8 +38,8 @@ public class ${modelNameUpperCamel}Controller {
     private ${modelNameUpperCamel}Service ${modelNameLowerCamel}Service;
 
     @PostMapping("/add")
-@ApiOperation(value = "${modelNameLowerCamel}新增")
-public Result add(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) {
+	@ApiOperation(value = "${modelNameLowerCamel}新增")
+	public Result add(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) {
     	if(${modelNameLowerCamel} == null){
     		return Result.fail(ResultCode.OBJECT_IS_NULL);
     	}
@@ -55,8 +55,8 @@ public Result add(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) {
     }
 
     @PostMapping("/delete")
-@ApiOperation(value = "${modelNameLowerCamel}删除")
-public Result delete(@RequestParam Long id) {
+	@ApiOperation(value = "${modelNameLowerCamel}删除")
+	public Result delete(@RequestParam Long id) {
     	if(id == null){
     		return Result.fail(ResultCode.ID_IS_NULL);
     	}
@@ -73,8 +73,8 @@ public Result delete(@RequestParam Long id) {
     }
 
     @PostMapping("/update")
-@ApiOperation(value = "${modelNameLowerCamel}更新")
-public Result update(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) {
+	@ApiOperation(value = "${modelNameLowerCamel}更新")
+	public Result update(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) {
     	if(${modelNameLowerCamel} == null){
     		return Result.fail(ResultCode.OBJECT_IS_NULL);
     	}
@@ -93,8 +93,8 @@ public Result update(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel})
     }
 
     @PostMapping("/detail")
-@ApiOperation(value = "${modelNameLowerCamel}获取详情")
-public Result<${modelNameUpperCamel}> detail(@RequestParam Long id) {
+	@ApiOperation(value = "${modelNameLowerCamel}获取详情")
+	public Result<${modelNameUpperCamel}> detail(@RequestParam Long id) {
     	if(id == null){
     		return Result.fail(ResultCode.ID_IS_NULL);
     	}
@@ -109,14 +109,14 @@ public Result<${modelNameUpperCamel}> detail(@RequestParam Long id) {
     }
 
     @PostMapping("/list")
-@ApiOperation(value = "${modelNameLowerCamel}获取列表")
-public Result
-<List<${modelNameUpperCamel}>> list(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+	@ApiOperation(value = "${modelNameLowerCamel}获取列表")
+	public Result<List<${modelNameUpperCamel}>> list(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(${modelNameLowerCamel}.getClass());
-//        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
+        Criteria criteria = condition.createCriteria();
+		criteria.andEqualTo("isDelete", 0);
+		condition.setOrderByClause("create_time DESC");
 		PageInfo pageInfo = null;
 		try {
     		 List<${modelNameUpperCamel}> list = ${modelNameLowerCamel}Service.findByCondition(condition);