From c74f8b0baf25875779fbb963cbc41bbee8d676ab Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 18 Jul 2025 20:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/modules/order/CommonOrderList.vue    |  31 +++--
 .../modules/order/modules/CommonOrderModal.vue     |  29 +++--
 .../service/impl/CommonOrderServiceImpl.java       | 127 ++++++++++-----------
 3 files changed, 92 insertions(+), 95 deletions(-)

diff --git a/admin-pc/src/views/modules/order/CommonOrderList.vue b/admin-pc/src/views/modules/order/CommonOrderList.vue
index bd3f24c..494d043 100644
--- a/admin-pc/src/views/modules/order/CommonOrderList.vue
+++ b/admin-pc/src/views/modules/order/CommonOrderList.vue
@@ -86,23 +86,22 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)" v-if="record.pid == '0'
-            && record.status == 1">发货</a>
+          <a @click="handleEdit(record)">编辑</a>
 
-<!--          <a-divider type="vertical" />-->
-<!--          <a-dropdown>-->
-<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
-<!--            <a-menu slot="overlay">-->
-<!--              <a-menu-item>-->
-<!--                <a @click="handleAddChild(record)">添加下级</a>-->
-<!--              </a-menu-item>-->
-<!--              <a-menu-item>-->
-<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">-->
-<!--                  <a>删除</a>-->
-<!--                </a-popconfirm>-->
-<!--              </a-menu-item>-->
-<!--            </a-menu>-->
-<!--          </a-dropdown>-->
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleAddChild(record)">添加下级</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
         </span>
 
       </a-table>
diff --git a/admin-pc/src/views/modules/order/modules/CommonOrderModal.vue b/admin-pc/src/views/modules/order/modules/CommonOrderModal.vue
index 06db082..971e894 100644
--- a/admin-pc/src/views/modules/order/modules/CommonOrderModal.vue
+++ b/admin-pc/src/views/modules/order/modules/CommonOrderModal.vue
@@ -11,43 +11,43 @@
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-          <j-dict-select-tag type="list" v-model="model.status" disabled dictCode="order_state" placeholder="请选择订单状态" />
+          <j-dict-select-tag type="list" v-model="model.status" dictCode="order_state" placeholder="请选择订单状态" />
         </a-form-model-item>
         <a-form-model-item label="下单用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-          <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" disabled/>
+          <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"/>
         </a-form-model-item>
 <!--        <a-form-model-item label="订单图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">-->
-<!--          <j-image-upload isMultiple  v-model="model.image" disabled></j-image-upload>-->
+<!--          <j-image-upload isMultiple  v-model="model.image"></j-image-upload>-->
 <!--        </a-form-model-item>-->
         <a-form-model-item label="订单标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
-          <a-input v-model="model.title" placeholder="请输入订单标题" disabled></a-input>
+          <a-input v-model="model.title" placeholder="请输入订单标题"></a-input>
         </a-form-model-item>
         <a-form-model-item label="客户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-          <a-input v-model="model.name" placeholder="请输入客户姓名" disabled></a-input>
+          <a-input v-model="model.name" placeholder="请输入客户姓名"></a-input>
         </a-form-model-item>
         <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-          <a-input v-model="model.phone" placeholder="请输入联系电话" disabled></a-input>
+          <a-input v-model="model.phone" placeholder="请输入联系电话"></a-input>
         </a-form-model-item>
         <a-form-model-item label="订单价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-          <a-input-number v-model="model.price" placeholder="请输入订单价格" style="width: 100%" disabled/>
+          <a-input-number v-model="model.price" placeholder="请输入订单价格" style="width: 100%"/>
         </a-form-model-item>
         <a-form-model-item label="配送地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-          <a-input v-model="model.address" placeholder="请输入配送地址" disabled></a-input>
+          <a-input v-model="model.address" placeholder="请输入配送地址"></a-input>
         </a-form-model-item>
         <a-form-model-item label="地址明细" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetail">
-          <a-input v-model="model.addressDetail" placeholder="请输入地址明细" disabled ></a-input>
+          <a-input v-model="model.addressDetail" placeholder="请输入地址明细" ></a-input>
         </a-form-model-item>
         <a-form-model-item label="直推佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oneMoney">
-          <a-input-number v-model="model.oneMoney" placeholder="请输入直推佣金" style="width: 100%" disabled/>
+          <a-input-number v-model="model.oneMoney" placeholder="请输入直推佣金" style="width: 100%"/>
         </a-form-model-item>
         <a-form-model-item label="间推佣金" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="twoMoney">
-          <a-input-number v-model="model.twoMoney" placeholder="请输入间推佣金" style="width: 100%" disabled/>
+          <a-input-number v-model="model.twoMoney" placeholder="请输入间推佣金" style="width: 100%"/>
         </a-form-model-item>
         <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
-          <a-input-number v-model="model.num" placeholder="请输入数量" style="width: 100%" disabled/>
+          <a-input-number v-model="model.num" placeholder="请输入数量" style="width: 100%"/>
         </a-form-model-item>
         <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
-          <a-input v-model="model.material" placeholder="请输入材质" disabled></a-input>
+          <a-input v-model="model.material" placeholder="请输入材质"></a-input>
         </a-form-model-item>
         <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
           <j-tree-select
@@ -58,12 +58,11 @@
             pidField="pid"
             pidValue="0"
             hasChildField="has_child"
-            disabled
             >
           </j-tree-select>
         </a-form-model-item>
         <a-form-model-item label="标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
-          <a-input v-model="model.shopId" placeholder="请输入标识" disabled></a-input>
+          <a-input v-model="model.shopId" placeholder="请输入标识"></a-input>
         </a-form-model-item>
         <a-form-model-item label="送货图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryPicture">
           <j-image-upload isMultiple  v-model="model.deliveryPicture" ></j-image-upload>
diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
index fdd37cb..9b425b6 100644
--- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
+++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java
@@ -33,61 +33,60 @@ public class CommonOrderServiceImpl extends ServiceImpl<CommonOrderMapper, Commo
     @Autowired
     private IHanHaiMemberService hanHaiMemberService;
 
-	@Override
-	public void addCommonOrder(CommonOrder commonOrder) {
-	   //新增时设置hasChild为0
-	    commonOrder.setHasChild(ICommonOrderService.NOCHILD);
-		if(oConvertUtils.isEmpty(commonOrder.getPid())){
-			commonOrder.setPid(ICommonOrderService.ROOT_PID_VALUE);
-		}else{
-			//如果当前节点父ID不为空 则设置父节点的hasChildren 为1
-			CommonOrder parent = baseMapper.selectById(commonOrder.getPid());
-			if(parent!=null && !"1".equals(parent.getHasChild())){
-				parent.setHasChild("1");
-				baseMapper.updateById(parent);
-			}
-		}
-		baseMapper.insert(commonOrder);
-	}
-	
-	@Override
-	public void updateCommonOrder(CommonOrder commonOrder) {
-		CommonOrder entity = this.getById(commonOrder.getId());
-		if(entity==null) {
-			throw new JeecgBootException("未找到对应实体");
-		}
-		String old_pid = entity.getPid();
-		String new_pid = commonOrder.getPid();
-		if(!old_pid.equals(new_pid)) {
-			updateOldParentNode(old_pid);
-			if(oConvertUtils.isEmpty(new_pid)){
-				commonOrder.setPid(ICommonOrderService.ROOT_PID_VALUE);
-			}
-			if(!ICommonOrderService.ROOT_PID_VALUE.equals(commonOrder.getPid())) {
-				baseMapper.updateTreeNodeStatus(commonOrder.getPid(), ICommonOrderService.HASCHILD);
-			}
-		}
+    @Override
+    public void addCommonOrder(CommonOrder commonOrder) {
+        //新增时设置hasChild为0
+        commonOrder.setHasChild(ICommonOrderService.NOCHILD);
+        if(oConvertUtils.isEmpty(commonOrder.getPid())){
+            commonOrder.setPid(ICommonOrderService.ROOT_PID_VALUE);
+        }else{
+            //如果当前节点父ID不为空 则设置父节点的hasChildren 为1
+            CommonOrder parent = baseMapper.selectById(commonOrder.getPid());
+            if(parent!=null && !"1".equals(parent.getHasChild())){
+                parent.setHasChild("1");
+                baseMapper.updateById(parent);
+            }
+        }
+        baseMapper.insert(commonOrder);
+    }
+
+    @Override
+    public void updateCommonOrder(CommonOrder commonOrder) {
+        CommonOrder entity = this.getById(commonOrder.getId());
+        if(entity==null) {
+            throw new JeecgBootException("未找到对应实体");
+        }
+        String old_pid = entity.getPid();
+        String new_pid = commonOrder.getPid();
+        if(!old_pid.equals(new_pid)) {
+            updateOldParentNode(old_pid);
+            if(oConvertUtils.isEmpty(new_pid)){
+                commonOrder.setPid(ICommonOrderService.ROOT_PID_VALUE);
+            }
+            if(!ICommonOrderService.ROOT_PID_VALUE.equals(commonOrder.getPid())) {
+                baseMapper.updateTreeNodeStatus(commonOrder.getPid(), ICommonOrderService.HASCHILD);
+            }
+        }
 
 
         //发货
-        if ("1".equals(commonOrder.getStatus())){
-            commonOrder.setStatus("2");
+        if ("2".equals(commonOrder.getStatus())){
             if("1".equals(commonOrder.getPayType())){
                 HanHaiMember member = hanHaiMemberService.getById(commonOrder.getUserId());
 
-
-
-                wxOrderLogisticsUtil.doShipmentOneself(commonOrder.getId(), commonOrder.getTitle(), member.getAppletOpenid());
+                try {
+                    wxOrderLogisticsUtil.doShipmentOneself(commonOrder.getId(), commonOrder.getTitle(), member.getAppletOpenid());
+                }catch (Exception e){}
             }
         }
 
-		baseMapper.updateById(commonOrder);
-	}
-	
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void deleteCommonOrder(String id) throws JeecgBootException {
-		//查询选中节点下所有子节点一并删除
+            baseMapper.updateById(commonOrder);
+        }
+
+        @Override
+        @Transactional(rollbackFor = Exception.class)
+        public void deleteCommonOrder(String id) throws JeecgBootException {
+            //查询选中节点下所有子节点一并删除
         id = this.queryTreeChildIds(id);
         if(id.indexOf(",")>0) {
             StringBuffer sb = new StringBuffer();
@@ -120,9 +119,9 @@ public class CommonOrderServiceImpl extends ServiceImpl<CommonOrderMapper, Commo
             updateOldParentNode(commonOrder.getPid());
             baseMapper.deleteById(id);
         }
-	}
-	
-	@Override
+        }
+
+        @Override
     public List<CommonOrder> queryTreeListNoPage(QueryWrapper<CommonOrder> queryWrapper) {
         List<CommonOrder> dataList = baseMapper.selectList(queryWrapper);
         List<CommonOrder> mapList = new ArrayList<>();
@@ -142,21 +141,21 @@ public class CommonOrderServiceImpl extends ServiceImpl<CommonOrderMapper, Commo
         }
         return mapList;
     }
-	
-	/**
-	 * 根据所传pid查询旧的父级节点的子节点并修改相应状态值
-	 * @param pid
-	 */
-	private void updateOldParentNode(String pid) {
-		if(!ICommonOrderService.ROOT_PID_VALUE.equals(pid)) {
-			Long count = baseMapper.selectCount(new QueryWrapper<CommonOrder>().eq("pid", pid));
-			if(count==null || count<=1) {
-				baseMapper.updateTreeNodeStatus(pid, ICommonOrderService.NOCHILD);
-			}
-		}
-	}
-
-	/**
+
+        /**
+         * 根据所传pid查询旧的父级节点的子节点并修改相应状态值
+         * @param pid
+         */
+        private void updateOldParentNode(String pid) {
+            if(!ICommonOrderService.ROOT_PID_VALUE.equals(pid)) {
+                Long count = baseMapper.selectCount(new QueryWrapper<CommonOrder>().eq("pid", pid));
+                if(count==null || count<=1) {
+                    baseMapper.updateTreeNodeStatus(pid, ICommonOrderService.NOCHILD);
+                }
+            }
+        }
+
+        /**
      * 递归查询节点的根节点
      * @param pidVal
      * @return