From 7a96b4f475c6fe409401e7f7430df32be668b1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com> Date: Sat, 4 Oct 2025 22:20:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A1=AE=E8=AE=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dou/controller/DouOrderContoller.java | 21 ++-- .../pdd/controller/PddOrderController.java | 9 +- .../tao/controller/TaoOrderController.java | 8 ++ .../wei/controller/WeiOrderController.java | 9 +- vue/src/views/tao/order/index.vue | 110 +++++++++--------- 5 files changed, 91 insertions(+), 66 deletions(-) diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java index 93c58e4b..9b017b82 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java @@ -18,6 +18,7 @@ import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @Slf4j @@ -60,19 +61,17 @@ public class DouOrderContoller extends BaseController { @PostMapping("/confirmOrder") public AjaxResult confirmOrder(@RequestBody DouOrderConfirmBo bo) { log.info("=========确认订单======={}", JSONObject.toJSONString(bo)); -// bo.setUpdateBy(getUsername()); + if(bo.getOrderId()==null) return AjaxResult.error("订单id不能为空"); + if(StringUtils.isEmpty(bo.getReceiver())) return AjaxResult.error("缺少参数：receiver"); + if(StringUtils.isEmpty(bo.getMobile())) return AjaxResult.error("缺少参数：mobile"); + if(StringUtils.isEmpty(bo.getProvince())) return AjaxResult.error("缺少参数：province"); + if(StringUtils.isEmpty(bo.getCity())) return AjaxResult.error("缺少参数：city"); + if(StringUtils.isEmpty(bo.getTown())) return AjaxResult.error("缺少参数：town"); + if(StringUtils.isEmpty(bo.getAddress())) return AjaxResult.error("缺少参数：address"); + var result = orderService.confirmOrder(bo); if(result.getCode()==0) return success(); else return AjaxResult.error(result.getMsg()); -// if(result == -1) return new AjaxResult(501,"已确认过了！请勿重复确认！"); -// else if(result == -2) return new AjaxResult(502,"订单已存在！请勿重复确认！"); -// else if(result == -3) return new AjaxResult(503,"请指定发货方式！"); -// else if(result == -4) return new AjaxResult(504,"发货方式不支持！"); -// else if(result == -11) return new AjaxResult(511,"商品SKU编码不存在！"); -// else if(result == -12) return new AjaxResult(512,"商品信息不存在！"); -// -// -// return toAjax(result); -// return AjaxResult.error("未实现"); + } } diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java index b6b2c264..89079301 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java @@ -18,6 +18,7 @@ import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @Slf4j @@ -62,7 +63,13 @@ public class PddOrderController extends BaseController { @PostMapping("/confirmOrder") public AjaxResult confirmOrder(@RequestBody PddOrderConfirmBo bo) { log.info("=========确认订单======={}", JSONObject.toJSONString(bo)); - + if(bo.getOrderId()==null) return AjaxResult.error("订单id不能为空"); + if(StringUtils.isEmpty(bo.getReceiver())) return AjaxResult.error("缺少参数：receiver"); + if(StringUtils.isEmpty(bo.getMobile())) return AjaxResult.error("缺少参数：mobile"); + if(StringUtils.isEmpty(bo.getProvince())) return AjaxResult.error("缺少参数：province"); + if(StringUtils.isEmpty(bo.getCity())) return AjaxResult.error("缺少参数：city"); + if(StringUtils.isEmpty(bo.getTown())) return AjaxResult.error("缺少参数：town"); + if(StringUtils.isEmpty(bo.getAddress())) return AjaxResult.error("缺少参数：address"); var result = orderService.confirmOrder(bo); if(result.getCode()==0) return success(); else return AjaxResult.error(result.getMsg()); diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java index 7f9885f2..038aef3e 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java @@ -18,6 +18,7 @@ import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @Slf4j @@ -62,6 +63,13 @@ public class TaoOrderController extends BaseController { @PostMapping("/confirmOrder") public AjaxResult confirmOrder(@RequestBody TaoOrderConfirmBo bo) { log.info("=========确认订单======={}", JSONObject.toJSONString(bo)); + if(bo.getOrderId()==null) return AjaxResult.error("订单id不能为空"); + if(StringUtils.isEmpty(bo.getReceiver())) return AjaxResult.error("缺少参数：receiver"); + if(StringUtils.isEmpty(bo.getMobile())) return AjaxResult.error("缺少参数：mobile"); + if(StringUtils.isEmpty(bo.getProvince())) return AjaxResult.error("缺少参数：province"); + if(StringUtils.isEmpty(bo.getCity())) return AjaxResult.error("缺少参数：city"); + if(StringUtils.isEmpty(bo.getTown())) return AjaxResult.error("缺少参数：town"); + if(StringUtils.isEmpty(bo.getAddress())) return AjaxResult.error("缺少参数：address"); var result = orderService.confirmOrder(bo); if(result.getCode()==0) return success(); diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java index 1ba6b852..8f8488c1 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java @@ -17,6 +17,7 @@ import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @Slf4j @@ -53,7 +54,13 @@ public class WeiOrderController extends BaseController { @PostMapping("/confirmOrder") public AjaxResult confirmOrder(@RequestBody WeiOrderConfirmBo bo) { log.info("=========确认订单======={}", JSONObject.toJSONString(bo)); - + if(bo.getOrderId()==null) return AjaxResult.error("订单id不能为空"); + if(StringUtils.isEmpty(bo.getReceiver())) return AjaxResult.error("缺少参数：receiver"); + if(StringUtils.isEmpty(bo.getMobile())) return AjaxResult.error("缺少参数：mobile"); + if(StringUtils.isEmpty(bo.getProvince())) return AjaxResult.error("缺少参数：province"); + if(StringUtils.isEmpty(bo.getCity())) return AjaxResult.error("缺少参数：city"); + if(StringUtils.isEmpty(bo.getTown())) return AjaxResult.error("缺少参数：town"); + if(StringUtils.isEmpty(bo.getAddress())) return AjaxResult.error("缺少参数：address"); var result = orderService.confirmOrder(bo); if(result.getCode()==0) return success(); else return AjaxResult.error(result.getMsg()); diff --git a/vue/src/views/tao/order/index.vue b/vue/src/views/tao/order/index.vue index 3133bd39..99d7b7d9 100644 --- a/vue/src/views/tao/order/index.vue +++ b/vue/src/views/tao/order/index.vue @@ -218,57 +218,56 @@ {{form.id}} - {{form.orderId}} + {{form.tid}} {{ shopList.find(x=>x.id === form.shopId)?shopList.find(x=>x.id === form.shopId).name:'' }} - - {{form.btypeDesc}} + + 一口价订单 + - {{ form.orderStatusDesc }} + 等待买家付款 + 卖家部分发货 + 待发货 + 待买家收货 + 交易成功 + 交易自动关闭 + 关闭交易 + 禁止发货 - - {{ form.mainStatusDesc }} + + 否 + 是 - - - - - - {{form.buyerWords}} + {{form.buyerMessage}} - {{form.sellerWords}} + {{form.sellerMemo}} - - {{form.cancelReason}} - - - {{ parseTime(form.createTime*1000) }} - - {{ parseTime(form.payTime*1000) }} - {{ parseTime(form.updateTime*1000) }} + + {{ form.created }} + {{form.payTime}} + {{ form.modified }} - - - {{form.promotionShopAmount}} - {{form.promotionTalentAmount}} - {{form.postAmount}} - {{form.orderAmount}} - {{ form.payAmount }} + + {{amountFormatter(null,null,form.discountFee) }} + {{amountFormatter(null,null,form.adjustFee) }} + {{amountFormatter(null,null,form.postFee) }} + {{amountFormatter(null,null,form.totalFee) }} + {{ amountFormatter(null,null,form.payment) }} - {{form.maskPostReceiver}} - {{form.maskPostTel}} - {{form.provinceName}}{{form.cityName}}{{form.townName}} - {{form.maskPostAddress}} + {{form.receiverName}} + {{form.receiverMobile}} + {{form.receiverState}}{{form.receiverCity}}{{form.receiverDistrict}}{{form.receiverTown}} + {{form.receiverAddress}} @@ -283,26 +282,26 @@ - + - - - - - - + + + + + + 收件人 - - + + - - + + - - + + @@ -338,6 +337,7 @@ import {MessageBox} from "element-ui"; import {isRelogin} from "../../../utils/request"; import Clipboard from "clipboard"; import {pcaTextArr} from "element-china-area-data"; +import {float} from "quill/ui/icons"; export default { name: "OrderTao", data() { @@ -376,6 +376,10 @@ export default { form: { }, rules: { + receiverName:[{ required: true, message: "不能为空", trigger: "blur" }], + receiverMobile:[{ required: true, message: "不能为空", trigger: "blur" }], + provinces:[{ required: true, message: "不能为空", trigger: "blur" }], + receiverAddress:[{ required: true, message: "不能为空", trigger: "blur" }], } }; }, @@ -406,6 +410,7 @@ export default { }) }, amountFormatter(row, column, cellValue, index) { + cellValue = parseFloat(cellValue) return '￥' + cellValue.toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,'); }, /** 查询淘宝订单列表 */ @@ -517,7 +522,6 @@ export default { const id = row.id || this.ids getOrder(id).then(response => { this.form = response.data; - this.goodsList = response.data.taoOrderItemList; this.detailOpen = true; this.detailTitle = "订单详情"; }); @@ -546,9 +550,9 @@ export default { getOrder(id).then(response => { this.form = response.data; this.form.provinces = [] - this.form.provinces.push(response.data.provinceName) - this.form.provinces.push(response.data.cityName) - this.form.provinces.push(response.data.townName) + this.form.provinces.push(response.data.receiverState) + this.form.provinces.push(response.data.receiverCity) + this.form.provinces.push(response.data.receiverDistrict) this.detailOpen = true; this.detailTitle = "确认订单"; this.isAudit = true @@ -562,9 +566,9 @@ export default { province:this.form.provinces[0], city:this.form.provinces[1], town:this.form.provinces[2], - address:this.form.maskPostAddress, - receiver:this.form.maskPostReceiver, - mobile:this.form.maskPostTel + address:this.form.receiverAddress, + receiver:this.form.receiverName, + mobile:this.form.receiverMobile } confirmOrder(form).then(response => {