## Opt - 限额(金额->业绩)
This commit is contained in:
parent
56b4a5525a
commit
05397b67ca
|
|
@ -344,9 +344,9 @@ public class ApiRetailOrderController {
|
||||||
String str = iRetailOrderService.confirmRegOrder(registerParam, gradeList);
|
String str = iRetailOrderService.confirmRegOrder(registerParam, gradeList);
|
||||||
// redis 拿金额
|
// redis 拿金额
|
||||||
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
|
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
|
||||||
if (ESpecialArea.RETAIL_REGISTER.getValue() == registerParam.getSpecialArea() && saOrder.getOrderAmount().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
|
if (ESpecialArea.RETAIL_REGISTER.getValue() == registerParam.getSpecialArea() && saOrder.getOrderAchieve().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
|
||||||
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
|
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
|
||||||
return AjaxResult.error("订单金额超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
|
return AjaxResult.error("订单业绩超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
|
||||||
}
|
}
|
||||||
|
|
||||||
return confirmOrderReturn(str, registerParam.getPkCreator(), registerParam.getShopList(), registerParam.getOrderCode());
|
return confirmOrderReturn(str, registerParam.getPkCreator(), registerParam.getShopList(), registerParam.getOrderCode());
|
||||||
|
|
@ -463,9 +463,9 @@ public class ApiRetailOrderController {
|
||||||
// 确认订单
|
// 确认订单
|
||||||
String str = iRetailOrderService.confirmOtherOrder(orderParam);
|
String str = iRetailOrderService.confirmOtherOrder(orderParam);
|
||||||
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode());
|
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode());
|
||||||
if (ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea() && saOrder.getOrderAmount().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
|
if (ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea() && saOrder.getOrderAchieve().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
|
||||||
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode());
|
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode());
|
||||||
return AjaxResult.error("订单金额超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
|
return AjaxResult.error("订单业绩超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
|
||||||
}
|
}
|
||||||
return confirmOrderReturn(str, orderParam.getPkCreator(), orderParam.getShopList(), orderParam.getOrderCode());
|
return confirmOrderReturn(str, orderParam.getPkCreator(), orderParam.getShopList(), orderParam.getOrderCode());
|
||||||
}
|
}
|
||||||
|
|
@ -822,9 +822,9 @@ public class ApiRetailOrderController {
|
||||||
String str = iRetailOrderService.confirmRegOrder(registerParam, gradeList);
|
String str = iRetailOrderService.confirmRegOrder(registerParam, gradeList);
|
||||||
// redis 拿金额
|
// redis 拿金额
|
||||||
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
|
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
|
||||||
if (ESpecialArea.RETAIL_REGISTER.getValue() == registerParam.getSpecialArea() && saOrder.getOrderAmount().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
|
if (ESpecialArea.RETAIL_REGISTER.getValue() == registerParam.getSpecialArea() && saOrder.getOrderAchieve().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
|
||||||
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
|
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
|
||||||
return AjaxResult.error("订单金额超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
|
return AjaxResult.error("订单业绩超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
|
||||||
}
|
}
|
||||||
|
|
||||||
return confirmSharedOrderReturn(str, registerParam.getPkCreator(), registerParam.getShopList(), registerParam.getOrderCode(), saOrder.getOrderAmount().add(saOrder.getPostage()));
|
return confirmSharedOrderReturn(str, registerParam.getPkCreator(), registerParam.getShopList(), registerParam.getOrderCode(), saOrder.getOrderAmount().add(saOrder.getPostage()));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue