From 808cc69dc7c72f3fa3221549c0b1da906e82bdf7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 18:47:36 +0800
Subject: [PATCH] 20210624 商品分类
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java | 14 +++++++++-----
gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java | 3 ++-
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 18 +++++++++++-------
gc-core/src/main/java/com/xzx/gc/entity/ScoreExpressInfo.java | 3 ++-
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreExpressInfo.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreExpressInfo.java
index 782fe24..e42eb4b 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreExpressInfo.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreExpressInfo.java
@@ -1,5 +1,6 @@
package com.xzx.gc.entity;
+import com.xzx.gc.common.entity.BaseEntity;
import lombok.Data;
import javax.persistence.Table;
@@ -10,7 +11,7 @@
**/
@Data
@Table(name = "xzx_score_express_info")
-public class ScoreExpressInfo extends BaseEntity{
+public class ScoreExpressInfo extends BaseEntity {
private String userId;
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
index fea0a21..ec10c26 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
@@ -1,5 +1,6 @@
package com.xzx.gc.entity;
+import com.xzx.gc.common.entity.BaseEntity;
import lombok.Data;
import javax.persistence.Table;
@@ -11,7 +12,7 @@
**/
@Data
@Table(name = "xzx_score_order")
-public class ScoreOrder {
+public class ScoreOrder extends BaseEntity {
private String orderNo;
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
index 4eabe4b..757654d 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
@@ -86,11 +86,15 @@
if(StrUtil.isEmpty(expressNo)){
return JsonResult.failMessage("快递单号不能为空！");
}
- orderService.deliverGoods(model);
- OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
- .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-发货-" + id).build();
- mqUtil.sendApp(build);
- return JsonResult.success("操作成功！");
+ Long expressId = orderService.deliverGoods(model);
+ if(expressId > 0){
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-发货-" + id).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success("操作成功！");
+ }else{
+ return JsonResult.success("操作失败！");
+ }
}
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index 04201e4..4cc2af1 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -96,7 +96,7 @@
return viewOrderVo;
}
- public void deliverGoods(DeliverGoodsDto model) {
+ public Long deliverGoods(DeliverGoodsDto model) {
/**
* 获取物流表的信息
* 更新物流信息
@@ -107,12 +107,16 @@
Example.Criteria criteriaExpress = exampleExpress.createCriteria();
criteriaExpress.andEqualTo("orderId",id);
ScoreExpressInfo scoreExpressInfo = scoreExpressInfoMapper.selectOneByExample(exampleExpress);
- scoreExpressInfo.setExpressNo(model.getExpressNo());
- scoreExpressInfo.setExpressCom(model.getExpressCom());
- scoreExpressInfoMapper.updateByPrimaryKeySelective(scoreExpressInfo);
+ if(ObjectUtil.isNotEmpty(scoreExpressInfo)){
+ scoreExpressInfo.setExpressNo(model.getExpressNo());
+ scoreExpressInfo.setExpressCom(model.getExpressCom());
+ scoreExpressInfoMapper.updateByPrimaryKeySelective(scoreExpressInfo);
- ScoreOrder scoreOrder = scoreOrderMapper.selectByPrimaryKey(id);
- scoreOrder.setStatus(ScoreOrder.STATUS_ING);
- scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+ ScoreOrder scoreOrder = new ScoreOrder();
+ scoreOrder.setId(id);
+ scoreOrder.setStatus(ScoreOrder.STATUS_ING);
+ scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+ }
+ return scoreExpressInfo.getId();
}
}
--
Gitblit v1.9.1