完善优化订单发货
This commit is contained in:
启航老齐
parent
7a11ccb7c8
commit
31047f4925
|
|
@ -11,7 +11,7 @@
|
|||
Target Server Version : 80043 (8.0.43)
|
||||
File Encoding : 65001
|
||||
|
||||
Date: 02/10/2025 00:08:31
|
||||
Date: 02/10/2025 08:25:20
|
||||
*/
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
|
|
@ -963,7 +963,7 @@ CREATE TABLE `o_order` (
|
|||
-- ----------------------------
|
||||
-- Records of o_order
|
||||
-- ----------------------------
|
||||
INSERT INTO `o_order` VALUES (40, '6946634625004279575', 400, 1007, NULL, '', '', NULL, 1, 1, 0, 0, 0, 0, 0, 20, '彭先生', '15818590119', '自由路122号大院', '四川省', '成都市', '武侯区', '2025-09-30 11:01:09', -1, 0, 0, '0', NULL, NULL, '2025-10-01 23:17:28', '手动确认订单', NULL, NULL, NULL);
|
||||
INSERT INTO `o_order` VALUES (40, '6946634625004279575', 400, 1007, NULL, '', '', NULL, 1, 11, 0, 0, 0, 0, 0, 20, '彭先生', '15818590119', '自由路122号大院', '四川省', '成都市', '武侯区', '2025-09-30 11:01:09', -1, 0, 0, '0', NULL, NULL, '2025-10-01 23:17:28', '手动确认订单', '2025-10-02 00:09:02', 'admin 操作取消订单', 'aaa');
|
||||
INSERT INTO `o_order` VALUES (41, '6921344645306088915', 400, 1007, NULL, '', '', NULL, 1, 1, 0, 0, 0, 0, 0, 0.02, '仇*', '1**********', '*************', '山东省', '威海市', '环翠区', '2025-09-23 10:52:56', -1, 0, 0, '0', NULL, NULL, '2025-10-01 23:19:13', '手动确认订单', NULL, NULL, NULL);
|
||||
INSERT INTO `o_order` VALUES (42, '6946198576192755115', 400, 1007, NULL, '', '', NULL, 1, 1, 0, 0, 0, 0, 0, 0.2, '雨*', '1**********', '**************', '浙江省', '杭州市', '余杭区', '2025-09-17 09:52:51', -1, 0, 0, '0', NULL, NULL, '2025-10-01 23:19:51', '手动确认订单', NULL, NULL, NULL);
|
||||
|
||||
|
|
@ -1011,7 +1011,7 @@ CREATE TABLE `o_order_item` (
|
|||
-- ----------------------------
|
||||
-- Records of o_order_item
|
||||
-- ----------------------------
|
||||
INSERT INTO `o_order_item` VALUES (45, 1007, 400, 40, '6946634625004279575', '6946634625004279575', '3553739561195010', 0, 0, '酒店一次性棉麻拖鞋居家待客便携加厚防滑半包全包客人拖鞋定 制', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_de9e0dd4d97fb13808d817386b96be7e_sx_188032_www800-800', '0', NULL, '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-01 23:17:28', '手动确认订单', NULL, NULL);
|
||||
INSERT INTO `o_order_item` VALUES (45, 1007, 400, 40, '6946634625004279575', '6946634625004279575', '3553739561195010', 0, 0, '酒店一次性棉麻拖鞋居家待客便携加厚防滑半包全包客人拖鞋定 制', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_de9e0dd4d97fb13808d817386b96be7e_sx_188032_www800-800', '0', NULL, '', 0, 0, 0, 0, 1, NULL, 0, 1, 11, -1, 0, 0, '2025-10-01 23:17:28', '手动确认订单', '2025-10-02 00:09:02', 'admin 操作取消订单');
|
||||
INSERT INTO `o_order_item` VALUES (46, 1007, 400, 41, '6921344645306088915', '6921344645306088915', '3415147054563586', 0, 0, '通用气质针织春夏收腰欧美法式潮流短款外套', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/ALSUvYM_m_6b2c63f75ace689f2e1b03224ce5fd7e_sx_27680_www600-600', '0', NULL, '', 0, 0, 0, 0, 2, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-01 23:19:13', '手动确认订单', NULL, NULL);
|
||||
INSERT INTO `o_order_item` VALUES (47, 1007, 400, 42, '6946198576192755115', '6946198576192755115', '3553832070819586', 0, 0, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子组合商品2', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', '0', NULL, '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-01 23:19:51', '手动确认订单', NULL, NULL);
|
||||
INSERT INTO `o_order_item` VALUES (48, 1007, 400, 42, '6946198576192755115', '6946198576192820651', '3553850395099138', 0, 0, '【测试商品勿拍】养车式_粉色波点吊带连衣裙子舒淇轮胎', 'https://p3-aio.ecombdimg.com/obj/ecom-shop-material/jpeg_m_6e81220e4cc8108c6619174f5ae353e3_sx_979970_www1440-1440', '0', NULL, '', 0, 0, 0, 0, 1, NULL, 0, 1, NULL, -1, 0, 0, '2025-10-01 23:19:51', '手动确认订单', NULL, NULL);
|
||||
|
|
@ -3549,7 +3549,7 @@ INSERT INTO `sys_menu` VALUES (2115, '商品库存管理', 7, 0, 'goods_inventor
|
|||
INSERT INTO `sys_menu` VALUES (2116, '商品出库管理', 7, 20, 'stock_out', 'stock/stockOut/index', NULL, 1, 0, 'C', '0', '0', '', 'guide', 'admin', '2024-09-21 20:44:46', 'admin', '2025-03-24 13:46:42', '');
|
||||
INSERT INTO `sys_menu` VALUES (2117, '仓位管理', 7, 91, 'position', 'stock/warehouse/position', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 11:52:18', 'admin', '2025-03-24 13:47:04', '');
|
||||
INSERT INTO `sys_menu` VALUES (2118, '新建商品入库单', 7, 11, 'stock_in/create', 'stock/stockIn/create.vue', NULL, 1, 0, 'C', '1', '0', '', '404', 'admin', '2024-09-22 14:49:40', 'admin', '2025-03-24 13:35:30', '');
|
||||
INSERT INTO `sys_menu` VALUES (2129, '发货&分配发货', 6, 0, 'manual_shipment', 'shipping/shipment/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2025-06-01 13:36:57', 'admin', '2025-06-01 13:39:59', '');
|
||||
INSERT INTO `sys_menu` VALUES (2129, '订单发货', 6, 0, 'manual_shipment', 'shipping/shipment/index', NULL, 1, 0, 'C', '0', '0', '', 'checkbox', 'admin', '2025-06-01 13:36:57', 'admin', '2025-10-02 00:15:02', '');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for sys_menu2
|
||||
|
|
@ -4003,7 +4003,7 @@ CREATE TABLE `sys_user` (
|
|||
-- ----------------------------
|
||||
-- Records of sys_user
|
||||
-- ----------------------------
|
||||
INSERT INTO `sys_user` VALUES (1, NULL, 'admin', '启航老齐A', '00', '280645618@qq.com', '18123879144', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-10-01 23:07:36', 'admin', '2023-08-07 19:31:37', '', '2025-10-01 15:07:36', '管理员');
|
||||
INSERT INTO `sys_user` VALUES (1, NULL, 'admin', '启航老齐A', '00', '280645618@qq.com', '18123879144', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2025-10-02 08:10:28', 'admin', '2023-08-07 19:31:37', '', '2025-10-02 00:10:27', '管理员');
|
||||
INSERT INTO `sys_user` VALUES (2, NULL, 'openapi', 'openApi接口专用', '00', '2806456181@qq.com', '15818590000', '0', '', '$2a$10$fHkhoqbMiyracAsTzl38H.55bu.M.of1FXk2EK7RQBjfic3tLU0Ue', '0', '0', '127.0.0.1', '2024-06-24 10:23:35', 'admin', '2024-03-17 14:55:22', 'admin', '2024-06-24 10:23:35', NULL);
|
||||
INSERT INTO `sys_user` VALUES (101, 101, '15818590119', 'aaa123', '00', '', '', '0', '', '$2a$10$pXcT6cHaObMeKuYd9vZb5uEb8PyUdF2AcqqRN1cBqiA9rV4qYQW7G', '0', '2', '', NULL, 'admin', '2024-08-15 13:45:25', '', NULL, NULL);
|
||||
INSERT INTO `sys_user` VALUES (102, 101, '15818590119', '老齐', '00', '', '', '0', '', '$2a$10$ysk.zgJ8wh25c7vOjKyZ8uarM2hkG0S51j8GYdJSo2kZmc3f8HdKe', '0', '0', '', NULL, 'admin', '2024-08-15 13:49:59', 'admin', '2025-02-10 16:26:20', NULL);
|
||||
|
|
|
|||
|
|
@ -26,6 +26,6 @@ public class DouOrderConfirmBo {
|
|||
/**
|
||||
* 发货类型 0仓库发货1供应商代发
|
||||
*/
|
||||
private Integer shipType;
|
||||
// private Integer shipType;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
package cn.qihangerp.module.open.dou.service;
|
||||
|
||||
import cn.qihangerp.model.entity.OOrder;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author qilip
|
||||
* @description 针对表【o_order(订单表)】的数据库操作Service
|
||||
* @createDate 2024-03-09 13:15:57
|
||||
*/
|
||||
public interface DouOOrderService extends IService<OOrder> {
|
||||
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
package cn.qihangerp.module.open.dou.service.impl;
|
||||
|
||||
import cn.qihangerp.model.entity.OOrder;
|
||||
import cn.qihangerp.module.open.dou.mapper.DouOOrderMapper;
|
||||
import cn.qihangerp.module.open.dou.service.DouOOrderService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @author qilip
|
||||
* @description 针对表【o_order(订单表)】的数据库操作Service实现
|
||||
* @createDate 2024-03-09 13:15:57
|
||||
*/
|
||||
@Slf4j
|
||||
@AllArgsConstructor
|
||||
@Service
|
||||
public class DouOOrderServiceImpl extends ServiceImpl<DouOOrderMapper, OOrder>
|
||||
implements DouOOrderService {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -209,7 +209,8 @@ public class DouOrderServiceImpl extends ServiceImpl<DouOrderMapper, DouOrder>
|
|||
order.setOrderNum(douOrder.getOrderId());
|
||||
order.setShopType(EnumShopType.DOU.getIndex());
|
||||
order.setShopId(douOrder.getSShopId());
|
||||
order.setShipType(confirmBo.getShipType());
|
||||
// order.setShipType(confirmBo.getShipType());
|
||||
order.setShipType(0);
|
||||
order.setBuyerMemo(douOrder.getBuyerWords());
|
||||
order.setSellerMemo(douOrder.getSellerWords());
|
||||
order.setRefundStatus(1);
|
||||
|
|
|
|||
|
|
@ -301,12 +301,12 @@
|
|||
<el-form-item label="详细地址" prop="maskPostAddress" v-if="isAudit">
|
||||
<el-input v-model="form.maskPostAddress" placeholder="请输入收件地址" style="width:350px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="发货方式" prop="shipType" v-if="isAudit">
|
||||
<el-select v-model="form.shipType" placeholder="发货类型" style="width:350px">
|
||||
<el-option label="供应商代发" value="1"></el-option>
|
||||
<el-option label="仓库发货" value="0"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="发货方式" prop="shipType" v-if="isAudit">-->
|
||||
<!-- <el-select v-model="form.shipType" placeholder="发货类型" style="width:350px">-->
|
||||
<!-- <el-option label="供应商代发" value="1"></el-option>-->
|
||||
<!-- <el-option label="仓库发货" value="0"></el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer" v-if="isAudit">
|
||||
|
|
@ -367,7 +367,7 @@ export default {
|
|||
maskPostTel: [{ required: true, message: '不能为空' }],
|
||||
provinces: [{ required: true, message: '不能为空' }],
|
||||
maskPostAddress: [{ required: true, message: '不能为空' }],
|
||||
shipType: [{ required: true, message: '不能为空' }],
|
||||
// shipType: [{ required: true, message: '不能为空' }],
|
||||
}
|
||||
};
|
||||
},
|
||||
|
|
|
|||
|
|
@ -257,26 +257,19 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
<el-button style="padding-right: 6px;padding-left: 6px"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-view"
|
||||
@click="handleDetail(scope.row)"
|
||||
>详情</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
<el-button v-if="scope.row.orderStatus===1"
|
||||
size="mini" style="padding-right: 6px;padding-left: 6px"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleCancel(scope.row)"
|
||||
>取消订单</el-button>
|
||||
<div>
|
||||
<el-button style="padding-right: 6px;padding-left: 6px"
|
||||
size="mini" plain
|
||||
type="success"
|
||||
icon="el-icon-share"
|
||||
@click="handleShip(scope.row)"
|
||||
>订单发货</el-button>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
|
|||
|
|
@ -17,19 +17,29 @@
|
|||
:label="item.name"
|
||||
:value="item.id">
|
||||
<span style="float: left">{{ item.name }}</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 3">拼多多</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 5">微信小店</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 9">其他渠道</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 500">微信小店</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 200">京东POP</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 280">京东自营</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 100">淘宝天猫</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 300">拼多多</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 400">抖店</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px" v-if="item.type === 999">线下渠道</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
|
||||
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
|
|
@ -131,6 +141,22 @@
|
|||
<div style="color: #ed5565">{{scope.row.sellerMemo}}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button style="padding-right: 6px;padding-left: 6px"
|
||||
size="mini" plain
|
||||
type="primary"
|
||||
icon="el-icon-view"
|
||||
@click="allocateShipmentToSupplier(scope.row)"
|
||||
>供应商发货</el-button>
|
||||
<el-button style="padding-right: 6px;padding-left: 6px"
|
||||
size="mini" type="success" plain
|
||||
icon="el-icon-guide"
|
||||
@click="handleShip(scope.row)"
|
||||
>手动发货</el-button>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
|
|
|
|||
Loading…
Reference in New Issue