oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java

@@ -230,7 +230,7 @@
    @Log("骑手小程序：微信授权登录")
    @ApiOperation("骑手小程序：微信授权登录")
    @AnonymousPostMapping(value = "/rider/login/weixin")
    public ResponseEntity<Object> riderLoginWeixin(@Validated @RequestBody AuthUserWeixinDto authUser, HttpServletRequest request) throws Exception {
    public ResponseEntity<Object> riderLoginWeixin(@Validated @RequestBody AuthUserWeixinDto authUser, HttpServletRequest request) {
        JSONObject jsonObject;
        switch (authUser.getType()) {
            case OLD:

 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java

@@ -52,7 +52,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void create(OrderResponse response, OrderStatusEnum statusEnum, String cardName) {
    public synchronized void create(OrderResponse response, OrderStatusEnum statusEnum, String cardName) {
        String userType = ConstantsKey.BUYER;
        String username = null;
        switch (statusEnum) {

 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderServiceImpl.java

@@ -278,7 +278,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void cancel(String orderNum) {
    public synchronized void cancel(String orderNum) {
        OrderResponse response = getByOrderNum(orderNum);
        Order order = response.getOrder();
        if (order == null) {

 oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@
import com.oying.exception.EntityExistException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
@@ -128,8 +129,10 @@
        // 清除缓存
        delCaches(user.getId(), user.getUsername());
        // 更新用户角色
        userRoleMapper.deleteByUserId(resources.getId());
        userRoleMapper.insertData(resources.getId(), resources.getRoles());
        if (!ObjectUtils.isEmpty(resources.getRoles())) {
            userRoleMapper.deleteByUserId(resources.getId());
            userRoleMapper.insertData(resources.getId(), resources.getRoles());
        }
    }

    @Override