Commit 1ce7c5ae by huluobin

订单号加锁bug

parent 45f8fc26
...@@ -959,7 +959,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -959,7 +959,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderManage.setPayUser(payCustomer.getId()); orderManage.setPayUser(payCustomer.getId());
//是否朋友支付 //是否朋友支付
orderManage.setIsFriendPay(payCustomer.getId().equals(orderManage.getOrderUser()) ? 2 : 1); orderManage.setIsFriendPay(payCustomer.getId().equals(orderManage.getOrderUser()) ? 2 : 1);
this.updateById((orderManage));
log.info("扣除余额"); log.info("扣除余额");
...@@ -988,8 +987,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -988,8 +987,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
.build(); .build();
customerBalanceService.consumer(consumerCmd); customerBalanceService.consumer(consumerCmd);
this.updateById(orderManage);
marketService.calcOrderAmount(orderManage.getId()); marketService.calcOrderAmount(orderManage.getId());
orderManageMapper.updateById(orderManage);
} }
@Override @Override
......
...@@ -193,6 +193,7 @@ public class PayServiceImpl implements PayService { ...@@ -193,6 +193,7 @@ public class PayServiceImpl implements PayService {
.build(); .build();
log.info("**微信下单参数构造**,{}", wxPayUnifiedOrderRequest.toString()); log.info("**微信下单参数构造**,{}", wxPayUnifiedOrderRequest.toString());
orderManage.setPayUser(SessionUtils.getCustomerId()); orderManage.setPayUser(SessionUtils.getCustomerId());
orderManageMapper.updateById(orderManage); orderManageMapper.updateById(orderManage);
//微信统一下单 //微信统一下单
......
...@@ -49,17 +49,13 @@ public class DashboardController { ...@@ -49,17 +49,13 @@ public class DashboardController {
GetStoreTrendApiResp resp = dashboardService.getStoreTrendApi(request); GetStoreTrendApiResp resp = dashboardService.getStoreTrendApi(request);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
// return JsonResult.success(resp);
} }
@ApiOperation("见doc文档getStoreListApi") @ApiOperation("见doc文档getStoreListApi")
@PostMapping("/no_getStoreListApi") @PostMapping("/no_getStoreListApi")
public JsonResult<List<Map<String, Object>>> getStoreListApi(@RequestBody GetStoreListApiRequest request) { public JsonResult<List<Map<String, Object>>> getStoreListApi(@RequestBody GetStoreListApiRequest request) {
List<Map<String, Object>> result = dashboardService.getStoreListApi(request); List<Map<String, Object>> result = dashboardService.getStoreListApi(request);
// return JsonResult.success(result);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
} }
@ApiOperation("见doc文档preStorageSumApi") @ApiOperation("见doc文档preStorageSumApi")
...@@ -67,7 +63,6 @@ public class DashboardController { ...@@ -67,7 +63,6 @@ public class DashboardController {
public JsonResult<Map<String, Object>> preStorageSumApi(@RequestBody PreStorageSumApiRequest request) { public JsonResult<Map<String, Object>> preStorageSumApi(@RequestBody PreStorageSumApiRequest request) {
Map<String, Object> result = dashboardService.preStorageSumApi(request); Map<String, Object> result = dashboardService.preStorageSumApi(request);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
} }
...@@ -76,7 +71,6 @@ public class DashboardController { ...@@ -76,7 +71,6 @@ public class DashboardController {
public JsonResult<Map<String, Object>> revenueSumByTypeApi(@RequestBody RevenueSumByTypeApiRequest request) { public JsonResult<Map<String, Object>> revenueSumByTypeApi(@RequestBody RevenueSumByTypeApiRequest request) {
Map<String, Object> result = dashboardService.revenueSumByTypeApi(request); Map<String, Object> result = dashboardService.revenueSumByTypeApi(request);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
} }
...@@ -85,8 +79,6 @@ public class DashboardController { ...@@ -85,8 +79,6 @@ public class DashboardController {
public JsonResult<List<Map<String, Object>>> revenueTypeListApi(@RequestBody RevenueTypeListRequest request) { public JsonResult<List<Map<String, Object>>> revenueTypeListApi(@RequestBody RevenueTypeListRequest request) {
List<Map<String, Object>> result = dashboardService.revenueTypeListApi(request); List<Map<String, Object>> result = dashboardService.revenueTypeListApi(request);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
} }
...@@ -95,8 +87,6 @@ public class DashboardController { ...@@ -95,8 +87,6 @@ public class DashboardController {
public JsonResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request) { public JsonResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request) {
List<Map<String, Object>> result = dashboardService.revenueSumApi(request); List<Map<String, Object>> result = dashboardService.revenueSumApi(request);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
} }
...@@ -105,8 +95,6 @@ public class DashboardController { ...@@ -105,8 +95,6 @@ public class DashboardController {
public JsonResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(@RequestBody GetTechnicianPageRequest request) { public JsonResult<AdminPage<AdminTechnicianScoreResp>> getTechnicianPage(@RequestBody GetTechnicianPageRequest request) {
AdminPage<AdminTechnicianScoreResp> respAdminPage = dashboardService.getTechnicianPage(request); AdminPage<AdminTechnicianScoreResp> respAdminPage = dashboardService.getTechnicianPage(request);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
} }
...@@ -115,8 +103,6 @@ public class DashboardController { ...@@ -115,8 +103,6 @@ public class DashboardController {
public JsonResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(@RequestBody AchievementsPersonaResultPageApiRequest request) { public JsonResult<AdminPage<AchievementsPersonaResult>> achievementsPersonaResultPageApi(@RequestBody AchievementsPersonaResultPageApiRequest request) {
AdminPage<AchievementsPersonaResult> page = dashboardService.achievementsPersonaResultPageApi(request); AdminPage<AchievementsPersonaResult> page = dashboardService.achievementsPersonaResultPageApi(request);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
} }
...@@ -125,7 +111,5 @@ public class DashboardController { ...@@ -125,7 +111,5 @@ public class DashboardController {
public JsonResult<List<Map<String, Object>>> revenueServiceListApi(@RequestBody RevenueServiceListApiRequest request) { public JsonResult<List<Map<String, Object>>> revenueServiceListApi(@RequestBody RevenueServiceListApiRequest request) {
List<Map<String, Object>> result = dashboardService.revenueServiceListApi(request); List<Map<String, Object>> result = dashboardService.revenueServiceListApi(request);
throw new RRException("Saas服务改造升级 预计22号升级完成"); throw new RRException("Saas服务改造升级 预计22号升级完成");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment