diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java index 2c596d4..1caea84 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckValidator.java @@ -1,7 +1,6 @@ package com.cowr.ssjygl.order.ordercluster.truck; import com.jfinal.core.Controller; -import com.jfinal.kit.StrKit; import com.cowr.common.validator.CrudParamValidator; import com.cowr.common.view.Result; import com.cowr.model.OrderclusterTruck; diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java index c8a0daa..5108dea 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistancePKValidator.java @@ -17,8 +17,8 @@ public class SupermarketReceiverDistancePKValidator extends CrudParamValidator { protected void validate(Controller c) { validateRequired("supermarket_id", "supermarket_id", "supermarket_id 必填"); validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); - validateRequired("customer_receiver_id", "customer_receiver_id", "customer_receiver_id 必填"); - validateInteger("customer_receiver_id", 1, 2147483647, "customer_receiver_id", "customer_receiver_id 范围 1~2147483647"); + validateRequired("customer_id", "customer_id", "customer_id 必填"); + validateInteger("customer_id", 1, 2147483647, "customer_id", "customer_id 范围 1~2147483647"); } protected void handleError(Controller c) { diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java index b0bc50d..7998df0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceValidator.java @@ -16,7 +16,9 @@ public class SupermarketReceiverDistanceValidator extends CrudParamValidator { @Override protected void validate(Controller c) { validateRequired("supermarket_id", "supermarket_id", "supermarket_id 必填"); - validateRequired("customer_receiver_id", "customer_receiver_id", "customer_receiver_id 必填"); + validateInteger("supermarket_id", 1, 2147483647, "supermarket_id", "supermarket_id 范围 1~2147483647"); + validateRequired("customer_id", "customer_id", "customer_id 必填"); + validateInteger("customer_id", 1, 2147483647, "customer_id", "customer_id 范围 1~2147483647"); validateBigDecimal("distance", new java.math.BigDecimal(0), new java.math.BigDecimal(9.9999999999E10), "distance", "distance 范围 0~9.9999999999E10"); // 使用 model 更新时,model 不能只有主键有值 diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java index 3d5cce7..c3da6c7 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceController.java @@ -1,5 +1,6 @@ package com.cowr.service.ssjygl.supermarket.receiverdistance; +import com.cowr.common.base.BaseController; import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.SupermarketReceiverDistance; @@ -17,7 +18,7 @@ import com.jfinal.core.Controller; * Remarks: 客户收获地址到每个超市的距离 * PrimaryKey: supermarket_id,customer_receiver_id */ -public class SupermarketReceiverDistanceController extends Controller { +public class SupermarketReceiverDistanceController extends BaseController { /** * 按主键检查对象是否存在 @@ -43,8 +44,11 @@ public class SupermarketReceiverDistanceController extends Controller { return; } - SupermarketReceiverDistance model = getModel(SupermarketReceiverDistance.class, "", true); // 忽略不在model中的字段 - renderJson(SupermarketReceiverDistanceSyncService.me.save(model, tokenuser)); + int customer_id = getInt("customer_id"); + int supermarket_id = getInt("supermarket_id"); + double distance = getParaToDouble("distance"); + + renderJson(SupermarketReceiverDistanceSyncService.me.save(customer_id, supermarket_id, distance, tokenuser)); } @Before(SupermarketReceiverDistanceValidator.class) @@ -104,8 +108,11 @@ public class SupermarketReceiverDistanceController extends Controller { return; } - SupermarketReceiverDistance model = getModel(SupermarketReceiverDistance.class, "", true); // 忽略不在model中的字段 - renderJson(SupermarketReceiverDistanceSyncService.me.update(model, tokenuser)); + int customer_id = getInt("customer_id"); + int supermarket_id = getInt("supermarket_id"); + double distance = getParaToDouble("distance"); + + renderJson(SupermarketReceiverDistanceSyncService.me.update(customer_id, supermarket_id, distance, tokenuser)); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java index e4e6a78..aa9db43 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/supermarket/receiverdistance/SupermarketReceiverDistanceSyncService.java @@ -9,8 +9,8 @@ import java.math.BigDecimal; public class SupermarketReceiverDistanceSyncService extends BaseSyncService { public static SupermarketReceiverDistanceSyncService me = new SupermarketReceiverDistanceSyncService(); - public Result save(int customer_id, int supermarker_id, double distance, Sysuser sysuser){ - Supermarket supermarket = Supermarket.dao.findById(supermarker_id); + public Result save(int customer_id, int supermarket_id, double distance, Sysuser sysuser){ + Supermarket supermarket = Supermarket.dao.findById(supermarket_id); if(supermarket == null){ return Result.failed("未找到对应超市信息"); @@ -30,14 +30,14 @@ public class SupermarketReceiverDistanceSyncService extends BaseSyncService { SupermarketReceiverDistance model = new SupermarketReceiverDistance(); model.setCustomerReceiverId(cr.getId()); - model.setSupermarketId(supermarker_id); + model.setSupermarketId(supermarket_id); model.setDistance(new BigDecimal(distance)); return super.save(model, sysuser); } - public Result update(int customer_id, int supermarker_id, double distance, Sysuser sysuser){ - Supermarket supermarket = Supermarket.dao.findById(supermarker_id); + public Result update(int customer_id, int supermarket_id, double distance, Sysuser sysuser){ + Supermarket supermarket = Supermarket.dao.findById(supermarket_id); if(supermarket == null){ return Result.failed("未找到对应超市信息"); @@ -56,12 +56,12 @@ public class SupermarketReceiverDistanceSyncService extends BaseSyncService { } SupermarketReceiverDistance model = SupermarketReceiverDistance.dao.findFirst( - "select * from supermarket_receiver_distance t where t.customer_receiver_id = ? and t.supermarket_id = ? limit 1", cr.getId(), supermarker_id); + "select * from supermarket_receiver_distance t where t.customer_receiver_id = ? and t.supermarket_id = ? limit 1", cr.getId(), supermarket_id); if(model == null){ model = new SupermarketReceiverDistance(); model.setCustomerReceiverId(cr.getId()); - model.setSupermarketId(supermarker_id); + model.setSupermarketId(supermarket_id); model.setDistance(new BigDecimal(distance)); return super.save(model, sysuser);