Merge branch 'develop'

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -506,10 +506,11 @@ public class OrderBaseLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         PgOrderWorker one = pgOrderWorkerService.lambdaQuery()
                 .eq(PgOrderWorker::getOrderBaseId, orderBaseId)
+                .eq(PgOrderWorker::getIsMaster, true)
                 .and(item -> item.eq(PgOrderWorker::getWorkerId, currentCompanyWechat.getUserId())
                 .or(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()))
                         .eq(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),PgOrderWorker::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber()))
-
+                .last("limit 1")
                 .one();
         if (one == null) {
             throw new RemoteServiceException("暂无权限接单");

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/utils/oss/OSSUtil.java

@@ -60,7 +60,7 @@ public class OSSUtil {
     }
 
     public OSS buildClient(){
-        return new OSSClientBuilder().build(OSS_ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECERT);
+        return new OSSClientBuilder().build(!active.equals("prd") ? OSS_ENDPOINT_WW : OSS_ENDPOINT, ACCESS_KEY_ID, ACCESS_KEY_SECERT);
     }
 
     /**