更新

sendGoodNotPlat.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="GBK"?>
 <request>
     <functionID>dangdang.order.goods.send</functionID>
-    <time>2022-06-07 14:41:08</time>
+    <time>2022-06-08 08:18:15</time>
     <OrdersList>
         <OrderInfo>
-            <orderID>44629525486</orderID>
-            <logisticsName>ÖĐͨżěľÝ</logisticsName>
-            <logisticsNameAb>ZTO</logisticsNameAb>
-            <logisticsTel>400-827-0270</logisticsTel>
-            <logisticsOrderID></logisticsOrderID>
+            <orderID>44835804434</orderID>
+            <logisticsName>žŠśŤżěľÝ</logisticsName>
+            <logisticsNameAb>JD</logisticsNameAb>
+            <logisticsTel>950616</logisticsTel>
+            <logisticsOrderID>JDVA14191325557</logisticsOrderID>
             <SendGoodsList>
                 <ItemInfo>
-                    <itemID>11079786613</itemID>
+                    <itemID>11102076778</itemID>
                     <sendGoodsCount>1</sendGoodsCount>
                     <belongProductsPromoID></belongProductsPromoID>
-                    <productItemId>44629525486001</productItemId>
+                    <productItemId>44835804434001</productItemId>
                 </ItemInfo>
             </SendGoodsList>
         </OrderInfo>

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/AdminCheckQuartz.java

@@ -102,7 +102,7 @@ public class AdminCheckQuartz {
     /**
      * 订单数据定时轮训处理 每小时执行一次
      */
-    @Scheduled(cron = "0 0 7-20 * * ? ")
+//    @Scheduled(cron = "0 0 7-20 * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void dealOrder() throws Exception {
         Wrapper wrapper = new EntityWrapper();
@@ -138,9 +138,11 @@ public class AdminCheckQuartz {
                         shopOrderMapper.insert(data);
                     }
                     else{
-                        data.setOrderStatusName(shopOrder.getOrderStatusName());
-                        data.setGmtUpdate(new Date());
-                        shopOrderMapper.update(data,new EntityWrapper<ShopOrder>().eq("order_id",tmp.getOrderId()));
+                        if(!data.getOrderStatusName().equals(tmp.getOrderStatusName())){
+                            data.setOrderStatusName(shopOrder.getOrderStatusName());
+                            data.setGmtUpdate(new Date());
+                            shopOrderMapper.update(data,new EntityWrapper<ShopOrder>().eq("order_id",tmp.getOrderId()));
+                        }
                     }
                 }
 
@@ -161,7 +163,7 @@ public class AdminCheckQuartz {
     /**
      * 订单数据定时轮训处理 每小时执行一次
      */
-    @Scheduled(cron = "0 30 7-20 * * ? ")
+//    @Scheduled(cron = "0 30 7-20 * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void pullOrderList() throws Exception {
         List<ShopAccount> listAccount = shopAccountMapper.selectList(new EntityWrapper<ShopAccount>().eq("delete_flag",0));

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/shop/IShopAccountService.java

@@ -11,6 +11,8 @@ import com.iotechn.unimall.core.exception.ServiceException;
 import com.iotechn.unimall.data.model.Page;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 电商账户表Service接口
@@ -20,11 +22,11 @@ import java.util.Date;
  */
 @HttpOpenApi(group = "admin.shop.shopAccount", description = "电商账户表")
 public interface IShopAccountService {
-    @HttpMethod(description = "新增", permission = "admin:shop:shopAccount:add", permissionParentName = "宠物管理", permissionName = "电商账户表管理")
+    @HttpMethod(description = "新增", permission = "admin:shop:shopAccount:add", permissionParentName = "账户管理", permissionName = "电商账户表管理")
     public Boolean add(@NotNull @HttpParam(name = "shopAccount", type = HttpParamType.COMMON, description = "电商账户表") ShopAccount shopAccount,
                        @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
 
-    @HttpMethod(description = "列表", permission = "admin:shop:shopAccount:list", permissionParentName = "宠物管理", permissionName = "电商账户表管理")
+    @HttpMethod(description = "列表", permission = "admin:shop:shopAccount:list", permissionParentName = "账户管理", permissionName = "电商账户表管理")
     public Page<ShopAccount> list(
             @HttpParam(name = "dangAccount", type = HttpParamType.COMMON, description = "当当账号") String dangAccount,
             @HttpParam(name = "dangPassword", type = HttpParamType.COMMON, description = "当当密码") String dangPassword,
@@ -35,22 +37,25 @@ public interface IShopAccountService {
             @HttpParam(name = "gmtCreate", type = HttpParamType.COMMON, description = "") Date gmtCreate,
             @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
             @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
-            @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
-            @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
-            @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
+            @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "") Long adminId,
+            @HttpParam(name = "pageNum", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
+            @HttpParam(name = "pageSize", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
             throws ServiceException;
 
-    @HttpMethod(description = "删除", permission = "admin:shop:shopAccount:delete", permissionParentName = "宠物管理", permissionName = "电商账户表管理")
+    @HttpMethod(description = "删除", permission = "admin:shop:shopAccount:delete", permissionParentName = "账户管理", permissionName = "电商账户表管理")
     public Boolean delete(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
 
-    @HttpMethod(description = "修改", permission = "admin:shopAccount:shopAccount:update", permissionParentName = "宠物管理", permissionName = "电商账户表管理")
+    @HttpMethod(description = "修改", permission = "admin:shop:shopAccount:update", permissionParentName = "账户管理", permissionName = "电商账户表管理")
     public Boolean update(@NotNull @HttpParam(name = "shopAccount", type = HttpParamType.COMMON, description = "电商账户表") ShopAccount shopAccount,
                           @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
+    @HttpMethod(description = "修改", permission = "admin:shop:shopAccount:edit", permissionParentName = "账户管理", permissionName = "电商账户表管理")
+    public Boolean edit(@NotNull @HttpParam(name = "shopAccount", type = HttpParamType.COMMON, description = "电商账户表") ShopAccount shopAccount,
+                          @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "adminId") Long adminId) throws ServiceException;
 
-    @HttpMethod(description = "查询", permission = "admin:shop:shopAccount:get", permissionParentName = "宠物管理", permissionName = "电商账户表管理")
+    @HttpMethod(description = "查询", permission = "admin:shop:shopAccount:get", permissionParentName = "账户管理", permissionName = "电商账户表管理")
     public ShopAccount get(@NotNull @HttpParam(name = "id", type = HttpParamType.COMMON, description = "") Long id) throws ServiceException;
 
-    @HttpMethod(description = "导出excl表", permission = "admin:shop:shopAccount:export", permissionParentName = "宠物管理", permissionName = "电商账户表管理")
+    @HttpMethod(description = "导出excl表", permission = "admin:shop:shopAccount:export", permissionParentName = "账户管理", permissionName = "电商账户表管理")
     public String export(
             @HttpParam(name = "dangAccount", type = HttpParamType.COMMON, description = "当当账号") String dangAccount,
             @HttpParam(name = "dangPassword", type = HttpParamType.COMMON, description = "当当密码") String dangPassword,
@@ -64,5 +69,8 @@ public interface IShopAccountService {
             @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
             @HttpParam(name = "page", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
             @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit) throws ServiceException;
+    @HttpMethod(description = "角色枚举")
+    public List<Map<String,Object>> options(
+            @HttpParam(name = "adminId", type = HttpParamType.ADMIN_ID, description = "管理员ID") Long adminId) throws ServiceException;
 
 }

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/shop/impl/ShopAccountServiceImpl.java

@@ -1,7 +1,10 @@
 package com.iotechn.unimall.admin.api.shop.impl;
 
-import java.util.List;
+import java.util.*;
 
+import com.iotechn.unimall.data.domain.AdminDO;
+import com.iotechn.unimall.data.domain.RoleDO;
+import com.iotechn.unimall.data.mapper.AdminMapper;
 import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,8 +19,6 @@ import com.iotechn.unimall.data.domain.shop.ShopAccount;
 import com.iotechn.unimall.admin.api.shop.IShopAccountService;
 import com.iotechn.unimall.data.model.Page;
 
-import java.util.Date;
-
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -30,6 +31,8 @@ import org.springframework.transaction.annotation.Transactional;
 public class ShopAccountServiceImpl implements IShopAccountService {
     @Autowired
     private ShopAccountMapper shopAccountMapper;
+    @Autowired
+    private AdminMapper adminMapper;
 
     @Override
     public Boolean add(ShopAccount shopAccount, Long adminId) throws ServiceException {
@@ -70,11 +73,20 @@ public class ShopAccountServiceImpl implements IShopAccountService {
         if (!StringUtils.isEmpty(userId)) {
             wrapper.eq("user_id", userId);
         }
-        if (!StringUtils.isEmpty(adminId)) {
-            wrapper.eq("admin_id", adminId);
+        if (adminId != 1) {
+            wrapper.eq("user_id", adminId);
         }
         wrapper.eq("delete_flag", 0);
         List<ShopAccount> list = shopAccountMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        for (ShopAccount shopAccount:list
+             ) {
+            if(shopAccount.getUserId() != null){
+                AdminDO adminDO = adminMapper.selectById(shopAccount.getUserId());
+                if(adminDO != null){
+                    shopAccount.setUserName(adminDO.getUsername());
+                }
+            }
+        }
         Integer count = shopAccountMapper.selectCount(wrapper);
         return new Page<ShopAccount>(list, page, limit, count);
     }
@@ -100,7 +112,13 @@ public class ShopAccountServiceImpl implements IShopAccountService {
         shopAccount.setAdminId(adminId);
         return shopAccountMapper.updateById(shopAccount) > 0;
     }
-
+    @Override
+    public Boolean edit(ShopAccount shopAccount, Long adminId) throws ServiceException {
+        Date now = new Date();
+        shopAccount.setGmtUpdate(now);
+        shopAccount.setAdminId(adminId);
+        return shopAccountMapper.updateById(shopAccount) > 0;
+    }
     @Override
     public ShopAccount get(Long id) throws ServiceException {
         return shopAccountMapper.selectById(id);
@@ -143,4 +161,17 @@ public class ShopAccountServiceImpl implements IShopAccountService {
         ExcelUtil<ShopAccount> util = new ExcelUtil<ShopAccount>(ShopAccount.class);
         return util.exportExcel(list, "操作日志");
     }
+    @Override
+    public List<Map<String, Object>> options(Long adminId) throws ServiceException {
+        List<AdminDO> roleDOS = adminMapper.selectList(new EntityWrapper<>());
+        List<Map<String,Object>> list = new LinkedList<>();
+        roleDOS.forEach(item -> {
+            Map<String,Object> map = new HashMap<>();
+            map.put("value", item.getId());
+            map.put("label", item.getUsername());
+            list.add(map);
+        });
+        return list;
+    }
+
 }

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserService.java

@@ -56,6 +56,7 @@ public interface AdminUserService {
             @Range(min = 1) @HttpParam(name = "limit", type = HttpParamType.COMMON, description = "页码长度") Integer limit) throws ServiceException;
     @HttpMethod(description = "测试")
     public String test(
-            @HttpParam(name = "param", type = HttpParamType.COMMON, description = "参数") String nickname) throws Exception;
+            @HttpParam(name = "param", type = HttpParamType.COMMON, description = "参数") String nickname,
+            @HttpParam(name = "param1", type = HttpParamType.COMMON, description = "参数") String nickname1) throws Exception;
 
 }

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserServiceImpl.java

@@ -166,87 +166,83 @@ public class AdminUserServiceImpl implements AdminUserService {
     }
 
     @Override
-    public String test(String param) throws Exception {
-
-        List<ShopAccount> listAccount = shopAccountMapper.selectList(new EntityWrapper<ShopAccount>().eq("delete_flag",0));
-        for (ShopAccount shopAccount:listAccount
-        ) {
-            flushCookie(shopAccount);
-            CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-            HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=9999&orderStatus=ShippedToReceipt");
-            //这里可以设置请求参数，token等
-            get.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36");
-            get.addHeader("cookie",shopAccount.getFuziCookie());
-
-            CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
-            try{
+    public String test(String param,String param1) throws Exception {
+        ShopAccount shopAccount = shopAccountMapper.selectById(param);
+        flushCookie(shopAccount);
+        CloseableHttpClient httpClient = HttpClientBuilder.create().build();
+        HttpGet get = new HttpGet("https://shop.kongfz.com/buyer/order/index/?pageCurr=1&pageShow=9999&orderId="+param1+"&orderStatus=ShippedToReceipt");
+        //这里可以设置请求参数，token等
+        get.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36");
+        get.addHeader("cookie",shopAccount.getFuziCookie());
+        get.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+        CloseableHttpResponse response = httpClient.execute(get);//执行获取响应
+        try{
 
-                if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){//根据状态码处理
-                    String strTmp= EntityUtils.toString(response.getEntity(),"UTF-8");
-                    //返回字符串
-                    String res = unicodeToString(strTmp);
-                    JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
-                    Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
-                    List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(),ShopOrder.class);//"data"是根据返回值设定
-                    for (ShopOrder tmp: data
+            if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK){//根据状态码处理
+                String strTmp= EntityUtils.toString(response.getEntity(),"UTF-8");
+                //返回字符串
+                String res = unicodeToString(strTmp);
+                JSONObject datas = JSONObject.parseObject(res);//转换成JSON格式
+                Boolean status = (Boolean) datas.get("status");//获取返回数据状态，get获取的字段需要根据提供的返回值去获取
+                List<ShopOrder> data = JSONArray.parseArray(datas.get("data").toString(),ShopOrder.class);//"data"是根据返回值设定
+                for (ShopOrder tmp: data
+                ) {
+                    //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
+                    String regEx="[^0-9]+";
+                    Pattern pattern = Pattern.compile(regEx);
+                    //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
+                    String[] cs = pattern.split(tmp.getRemarkText());
+                    String dangOrder = "";
+                    for (String str:cs
                     ) {
-                        //正则表达式，用于匹配非数字串，+号用于匹配出多个非数字串
-                        String regEx="[^0-9]+";
-                        Pattern pattern = Pattern.compile(regEx);
-                        //用定义好的正则表达式拆分字符串，把字符串中的数字留出来
-                        String[] cs = pattern.split(tmp.getRemarkText());
-                        String dangOrder = "";
-                        for (String str:cs
-                        ) {
-                            if(dangOrder.length()>= 11){
-                                break;
-                            }
-                            dangOrder += str;
+                        if(dangOrder.length()>= 11){
+                            break;
                         }
-                        tmp.setDangOrder(dangOrder);
-                        tmp.setAccountId(shopAccount.getId());
-                        Long time  = Long.parseLong(tmp.getShippingTime());
-                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                        sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-                        String time1 = sdf.format(new Date(time * 1000));
-                        tmp.setShippingTime(time1);
-                        tmp.setDeleteFlag(0);
-                        tmp.setGmtUpdate(new Date());
-                        tmp.setGmtCreate(new Date());
-                        ShopOrder tt = new ShopOrder();
-                        tt.setOrderId(tmp.getOrderId());
-                        tt =  shopOrderMapper.selectOne(tt);
-                        if(tt == null){
-                            shopOrderMapper.insert(tmp);
-                        }
-                        else{
-                            if(tt.getDangOrderStatus().equals("未发货")){
-                                shopOrderMapper.update(tmp,new EntityWrapper<ShopOrder>().eq("order_id",tt.getOrderId()));
-                            }
+                        dangOrder += str;
+                    }
+                    tmp.setDangOrder(dangOrder);
+                    tmp.setAccountId(shopAccount.getId());
+                    Long time  = Long.parseLong(tmp.getShippingTime());
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+                    String time1 = sdf.format(new Date(time * 1000));
+                    tmp.setShippingTime(time1);
+                    tmp.setDeleteFlag(0);
+                    tmp.setGmtUpdate(new Date());
+                    tmp.setGmtCreate(new Date());
+                    ShopOrder tt = new ShopOrder();
+                    tt.setOrderId(tmp.getOrderId());
+                    tt =  shopOrderMapper.selectOne(tt);
+                    if(tt == null){
+                        shopOrderMapper.insert(tmp);
+                    }
+                    else{
+                        if(tt.getDangOrderStatus().equals("未发货")){
+                            shopOrderMapper.update(tmp,new EntityWrapper<ShopOrder>().eq("order_id",tt.getOrderId()));
                         }
                     }
-
                 }
 
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            finally {
-                response.close();
-                httpClient.close();
             }
+
+
+        } catch (IOException e) {
+            e.printStackTrace();
         }
-        Wrapper wrapper1 = new EntityWrapper();
-        wrapper1.eq("order_status_name","卖家已发货");
-        wrapper1.eq("dang_order_status","未发货");
-        wrapper1.orderBy("gmt_update",false);
-        List<ShopOrder> list1 = shopOrderMapper.selectList(wrapper1);
-        for (ShopOrder shopOrder: list1
-        ) {
-            ShopAccount shopAccount = shopAccountMapper.selectById(shopOrder.getAccountId());
-            dangOrderDeal(shopAccount,shopOrder);
+        finally {
+            response.close();
+            httpClient.close();
         }
+//        Wrapper wrapper1 = new EntityWrapper();
+//        wrapper1.eq("order_status_name","卖家已发货");
+//        wrapper1.eq("dang_order_status","未发货");
+//        wrapper1.orderBy("gmt_update",false);
+//        List<ShopOrder> list1 = shopOrderMapper.selectList(wrapper1);
+//        for (ShopOrder shopOrder: list1
+//        ) {
+//            ShopAccount shopAccount = shopAccountMapper.selectById(shopOrder.getAccountId());
+//            dangOrderDeal(shopAccount,shopOrder);
+//        }
         return "";
 
     }
@@ -267,6 +263,7 @@ public class AdminUserServiceImpl implements AdminUserService {
             try {
                 resultt = sdkClient.excute(ss);
                 if(resultt.getOrderID() == null){
+                    System.out.println("当当订单信息不存在:"+shopOrder.getDangOrder());
                     return;
                 }
             } catch (ApiException e) {
@@ -337,7 +334,8 @@ public class AdminUserServiceImpl implements AdminUserService {
             wrapper.like("fuzi_name",shopOrder.getShippingComName());
             List<ShopTran> list = shopTranMapper.selectList(wrapper);
             if(list.size() == 0 ){
-                throw new Exception("物流公司不存在");
+                System.out.println("物流公司不存在:"+shopOrder.getShippingComName());
+                return;
             }
             HashMap<String, Object> stringObjectHashMap = new HashMap<>();
             stringObjectHashMap.put("DANG_DANG_ORDER", shopOrder.getDangOrder());

unimall-admin/src/api/shop/account.js

@@ -71,3 +71,13 @@ export function exportAccount(query) {
     }
   })
 }
+
+export function userList() {
+  return request({
+    method: 'get',
+    params: {
+      _gp: 'admin.shop.shopAccount',
+      _mt: 'options'
+    }
+  })
+}

unimall-admin/src/router/route.json

@@ -46,6 +46,11 @@
 					"icon": "operlog",
 					"noCache": true,
 					"perms": [
+						"admin:shop:shopAccount:list",
+						"admin:shop:shopAccount:create",
+						"admin:shop:shopAccount:delete",
+						"admin:shop:shopAccount:update",
+						"admin:shop:shopAccount:edit"
 					]
 				}
 			}
@@ -140,7 +145,7 @@
 					"perms": [
 						"admin:shop:shopOrder:add",
 						"admin:shop:shopOrder:list",
-						"aadmin:shop:shopOrder:delete",
+						"admin:shop:shopOrder:delete",
 						"admin:shopOrder:shopOrder:update",
 						"admin:shop:shopOrder:get",
 						"admin:shop:shopOrder:export"

unimall-admin/src/views/shop/account/index.vue

@@ -44,7 +44,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          v-permission="['shop:account:add']"
+          v-permission="['shop:shopAccount:add']"
           type="primary"
           icon="el-icon-plus"
           size="mini"
@@ -54,7 +54,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          v-permission="['shop:account:edit']"
+          v-permission="['shop:shopAccount:edit']"
           :disabled="single"
           type="success"
           icon="el-icon-edit"
@@ -65,7 +65,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          v-permission="['shop:account:remove']"
+          v-permission="['shop:shopAccount:remove']"
           :disabled="multiple"
           type="danger"
           icon="el-icon-delete"
@@ -76,7 +76,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          v-permission="['shop:account:export']"
+          v-permission="['shop:shopAccount:export']"
           type="warning"
           icon="el-icon-download"
           size="mini"
@@ -101,19 +101,10 @@
       <el-table-column label="店铺id" align="center" prop="dangId" />
       <el-table-column label="店铺名称" align="center" prop="dangName" />
       <!-- <el-table-column label="运费模板" align="center" prop="dangTran" /> -->
-      <el-table-column label="孔网id" align="center" prop="fuziId" />
+      <!-- <el-table-column label="孔网id" align="center" prop="fuziId" /> -->
       <el-table-column label="孔网账号" align="center" prop="fuziAccount" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="gmtCreate"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.gmtCreate) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="管理员" align="center" prop="userName" />
       <el-table-column
         label="更新时间"
         align="center"
@@ -131,7 +122,15 @@
       >
         <template slot-scope="scope">
           <el-button
-            v-permission="['shop:account:edit']"
+            v-permission="['admin:shop:shopAccount:update']"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdateData(scope.row)"
+          >更新</el-button
+          >
+          <el-button
+            v-permission="['shop:shopAccount:edit']"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -139,7 +138,7 @@
           >修改</el-button
           >
           <el-button
-            v-permission="['shop:account:remove']"
+            v-permission="['shop:shopAccount:remove']"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -161,22 +160,32 @@
     <!-- 添加或修改电商账户表对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="店铺id" prop="dangId">
+        <el-form-item v-show="!updateFlag" label="授权用户" prop="userId">
+          <el-select v-model="form.userId" placeholder="请选择">
+            <el-option
+              v-for="item in userList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-show="!updateFlag" label="店铺id" prop="dangId">
           <el-input v-model="form.dangId" placeholder="请输入店铺id" />
         </el-form-item>
-        <el-form-item label="appkey" prop="dangAppKey">
+        <el-form-item v-show="!updateFlag" label="appkey" prop="dangAppKey">
           <el-input v-model="form.dangAppKey" placeholder="请输入appkey" />
         </el-form-item>
-        <el-form-item label="appsecret" prop="dangAppSecret">
+        <el-form-item v-show="!updateFlag" label="appsecret" prop="dangAppSecret">
           <el-input
             v-model="form.dangAppSecret"
             placeholder="请输appsecret"
           />
         </el-form-item>
-        <el-form-item label="session" prop="dangSession">
+        <el-form-item v-show="!updateFlag" label="session" prop="dangSession">
           <el-input v-model="form.dangSession" placeholder="session" />
         </el-form-item>
-        <el-form-item label="接口版本" prop="dangVersion">
+        <el-form-item v-show="!updateFlag" label="接口版本" prop="dangVersion">
           <el-input
             v-model="form.dangVersion"
             placeholder="请输入接口版本"
@@ -238,12 +247,14 @@ import {
   delAccount,
   addAccount,
   updateAccount,
-  exportAccount
+  exportAccount,
+  userList
 } from '@/api/shop/account'
 
 export default {
   data() {
     return {
+      userList: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -260,6 +271,7 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      updateFlag: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -341,12 +353,27 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids.join(',')
+      getAccount(id).then((response) => {
+        this.form = response.data.data
+        userList().then((response) => {
+          this.open = true
+          this.updateFlag = false
+          this.title = '修改电商账户表'
+          this.userList = response.data.data
+        })
+      })
+    },
+    /** 修改按钮操作 */
+    handleUpdateData(row) {
       this.reset()
       const id = row.id || this.ids.join(',')
       getAccount(id).then((response) => {
         this.form = response.data.data
         this.open = true
-        this.title = '修改电商账户表'
+        this.updateFlag = true
+        this.title = '更新电商账户表'
       })
     },
     /** 提交按钮 */

unimall-data/src/main/java/com/iotechn/unimall/data/domain/shop/ShopAccount.java

@@ -94,7 +94,9 @@ public class ShopAccount extends BaseDO{
     @Excel(name = "")
     @TableField("user_id")
     private Long userId;
-
+    /**  */
+    @TableField(exist = false)
+    private String userName;
     /**  */
     @Excel(name = "")
     @TableField("admin_id")