Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c92ea38c60
|
|
@ -131,6 +131,7 @@ public class CustomerAddressController extends BaseController {
|
||||||
@PostMapping("/update")
|
@PostMapping("/update")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
AjaxResult updateCustomerAddress(@RequestBody CustomerAddress customerAddress){
|
AjaxResult updateCustomerAddress(@RequestBody CustomerAddress customerAddress){
|
||||||
|
logger.info("地址库的订单修改方法{}",customerAddress);
|
||||||
try {
|
try {
|
||||||
// 判断下当前是否是默认地址
|
// 判断下当前是否是默认地址
|
||||||
if(ObjectUtil.equals(customerAddress.getIsDefault(), 1)){
|
if(ObjectUtil.equals(customerAddress.getIsDefault(), 1)){
|
||||||
|
|
|
||||||
|
|
@ -1590,6 +1590,7 @@ public class OrderMasterController extends BaseController {
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public AjaxResult editServingInfo(@RequestBody OrderMaster request) {
|
public AjaxResult editServingInfo(@RequestBody OrderMaster request) {
|
||||||
|
logger.info("另一处修改地址库的方法{}",request);
|
||||||
try {
|
try {
|
||||||
// 更新期望时间
|
// 更新期望时间
|
||||||
orderMasterService.updateOrderMaster(request);
|
orderMasterService.updateOrderMaster(request);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue