diff --git a/bweb/src/main/java/com/bweb/controller/BsUserController.java b/bweb/src/main/java/com/bweb/controller/BsUserController.java
index 83333f8..9a4c79f 100644
--- a/bweb/src/main/java/com/bweb/controller/BsUserController.java
+++ b/bweb/src/main/java/com/bweb/controller/BsUserController.java
@@ -65,22 +65,6 @@ public class BsUserController {
@Resource
private BsUserComplaintService userComplaintService;
- @Resource
- private PhgDataUserService phgDataUserService;
-
- @Resource
- private BsUserCardService userCardService;
-
- @Resource
- private CommonService commonService;
-
- @Resource
- private GoodsUserAddressService goodsUserAddressService;
-
- @Resource
- private GoodsSpecsService goodsSpecsService;
- @Resource
- private GoodsVpdService goodsVpdService;
@RequestMapping(value="/restore",method = RequestMethod.POST)
@ResponseBody
diff --git a/cweb/src/main/java/com/cweb/controller/CommonController.java b/cweb/src/main/java/com/cweb/controller/CommonController.java
index d5f0c63..169d92a 100644
--- a/cweb/src/main/java/com/cweb/controller/CommonController.java
+++ b/cweb/src/main/java/com/cweb/controller/CommonController.java
@@ -11,7 +11,7 @@ import com.hfkj.entity.BsOrderGoods;
import com.hfkj.entity.GoodsLogistics;
import com.hfkj.entity.GoodsUserAddress;
import com.hfkj.model.ResponseData;
-import com.hfkj.qianzhu.channel.QianZhuService;
+import com.hfkj.qianzhu.QianZhuService;
import com.hfkj.service.CommonService;
import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.GoodsUserAddressService;
@@ -24,8 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java b/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
index cd2f0a1..61e9cb8 100644
--- a/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
+++ b/cweb/src/main/java/com/cweb/controller/qianZhu/CinemaController.java
@@ -11,13 +11,11 @@ import com.hfkj.common.utils.PageUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsProductConfig;
import com.hfkj.model.ResponseData;
-import com.hfkj.model.goods.GoodsModel;
-import com.hfkj.qianzhu.channel.CinemaService;
+import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.jacoco.agent.rt.internal_035b120.core.internal.flow.IFrame;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
diff --git a/cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java b/cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java
index 9beafa7..f1350a2 100644
--- a/cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java
+++ b/cweb/src/main/java/com/cweb/controller/qianZhu/StarbucksController.java
@@ -2,14 +2,13 @@ package com.cweb.controller.qianZhu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.utils.PageUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.entity.BsProductConfig;
import com.hfkj.model.ResponseData;
-import com.hfkj.qianzhu.channel.StarbucksService;
+import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import io.swagger.annotations.Api;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
diff --git a/cweb/src/main/resources/prod/logback.xml b/cweb/src/main/resources/prod/logback.xml
index dd3c64b..9951ae1 100644
--- a/cweb/src/main/resources/prod/logback.xml
+++ b/cweb/src/main/resources/prod/logback.xml
@@ -88,7 +88,7 @@
UTF-8
-
+
diff --git a/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java b/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java
index d23ab63..3d6c4d5 100644
--- a/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java
+++ b/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java
@@ -9,9 +9,8 @@ import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsOrderCinema;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
-import com.hfkj.qianzhu.channel.CinemaService;
+import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.goods.BsOrderCinemaService;
-import com.hfkj.sysenum.SecUserObjectTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
diff --git a/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java b/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
index acdd6eb..3a56f61 100644
--- a/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
+++ b/order/src/main/java/com/order/controller/business/BsOrderGoodsController.java
@@ -156,8 +156,6 @@ public class BsOrderGoodsController {
SecUserSessionObject userModel = (SecUserSessionObject) sessionObject.getObject();
-
-
Map map = new HashMap<>();
if (userModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) {
map.put("merId", merId);
diff --git a/order/src/main/resources/dev/logback.xml b/order/src/main/resources/dev/logback.xml
index c88e0aa..5f39830 100644
--- a/order/src/main/resources/dev/logback.xml
+++ b/order/src/main/resources/dev/logback.xml
@@ -219,7 +219,7 @@
UTF-8
-
+
diff --git a/order/src/main/resources/prod/logback.xml b/order/src/main/resources/prod/logback.xml
index 06969bc..a33578a 100644
--- a/order/src/main/resources/prod/logback.xml
+++ b/order/src/main/resources/prod/logback.xml
@@ -219,7 +219,7 @@
UTF-8
-
+
diff --git a/service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java b/service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java
index dc67d5e..e5caeb3 100644
--- a/service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java
+++ b/service/src/main/java/com/hfkj/model/order/orderExport/OrderGoodsExportModel.java
@@ -108,6 +108,10 @@ public class OrderGoodsExportModel {
@ExcelProperty("物流状态")
public String logisticsStatusDesc;
+ @ColumnWidth(20)
+ @ExcelProperty("更新时间")
+ public Date updateTime;
+
@ColumnWidth(20)
@ExcelProperty("完成时间")
public Date finishTime;
diff --git a/service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java b/service/src/main/java/com/hfkj/qianzhu/CinemaService.java
similarity index 96%
rename from service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java
rename to service/src/main/java/com/hfkj/qianzhu/CinemaService.java
index 3c2f557..5bf7e4d 100644
--- a/service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java
+++ b/service/src/main/java/com/hfkj/qianzhu/CinemaService.java
@@ -1,19 +1,12 @@
-package com.hfkj.qianzhu.channel;
+package com.hfkj.qianzhu;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
-import com.hfkj.entity.BsProductConfig;
-import com.hfkj.service.BsProductConfigService;
-import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
-import javax.annotation.Resource;
-import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
-import java.util.Objects;
/**
* @ClassName CinemaService
diff --git a/service/src/main/java/com/hfkj/qianzhu/channel/KfcService.java b/service/src/main/java/com/hfkj/qianzhu/KfcService.java
similarity index 99%
rename from service/src/main/java/com/hfkj/qianzhu/channel/KfcService.java
rename to service/src/main/java/com/hfkj/qianzhu/KfcService.java
index e6c6b04..d01e38a 100644
--- a/service/src/main/java/com/hfkj/qianzhu/channel/KfcService.java
+++ b/service/src/main/java/com/hfkj/qianzhu/KfcService.java
@@ -1,4 +1,4 @@
-package com.hfkj.qianzhu.channel;
+package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
diff --git a/service/src/main/java/com/hfkj/qianzhu/channel/QianZhuService.java b/service/src/main/java/com/hfkj/qianzhu/QianZhuService.java
similarity index 99%
rename from service/src/main/java/com/hfkj/qianzhu/channel/QianZhuService.java
rename to service/src/main/java/com/hfkj/qianzhu/QianZhuService.java
index 1579417..ca77ba8 100644
--- a/service/src/main/java/com/hfkj/qianzhu/channel/QianZhuService.java
+++ b/service/src/main/java/com/hfkj/qianzhu/QianZhuService.java
@@ -1,4 +1,4 @@
-package com.hfkj.qianzhu.channel;
+package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
diff --git a/service/src/main/java/com/hfkj/qianzhu/channel/StarbucksService.java b/service/src/main/java/com/hfkj/qianzhu/StarbucksService.java
similarity index 98%
rename from service/src/main/java/com/hfkj/qianzhu/channel/StarbucksService.java
rename to service/src/main/java/com/hfkj/qianzhu/StarbucksService.java
index cdca58f..894f0f5 100644
--- a/service/src/main/java/com/hfkj/qianzhu/channel/StarbucksService.java
+++ b/service/src/main/java/com/hfkj/qianzhu/StarbucksService.java
@@ -1,4 +1,4 @@
-package com.hfkj.qianzhu.channel;
+package com.hfkj.qianzhu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -7,7 +7,6 @@ import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.CommonUtil;
import com.hfkj.common.utils.DateUtil;
-import com.mysql.jdbc.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
index 674a1ae..c500a32 100644
--- a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderGoodsServiceImpl.java
@@ -271,7 +271,6 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
@Override
public void confirmReceipt(Long orderGoodsId) {
BsOrderGoods orderGoods = queryDetail(orderGoodsId);
-
if (orderGoods == null ||
orderGoods.getStatus() == 1 ||
orderGoods.getStatus() == 5 ||
@@ -286,6 +285,7 @@ public class BsOrderGoodsServiceImpl implements BsOrderGoodsService {
orderService.childOrderComplete(orderGoods.getChildOrderNo());
orderGoods.setStatus(OrderChildStatusEnum.status3.getCode());
orderGoods.setUpdateTime(new Date());
+ orderGoods.setFinishTime(new Date());
update(orderGoods);
// 删除缓存
orderService.cacheDelete(orderGoods.getOrderNo());
diff --git a/service/src/main/java/com/hfkj/service/order/OrderCreateService.java b/service/src/main/java/com/hfkj/service/order/OrderCreateService.java
index 68556db..922414b 100644
--- a/service/src/main/java/com/hfkj/service/order/OrderCreateService.java
+++ b/service/src/main/java/com/hfkj/service/order/OrderCreateService.java
@@ -7,14 +7,12 @@ import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.RandomUtils;
-import com.hfkj.common.utils.RedisUtil;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.model.order.OrderModel;
-import com.hfkj.qianzhu.channel.CinemaService;
-import com.hfkj.qianzhu.channel.StarbucksService;
-import com.hfkj.service.BsMerService;
+import com.hfkj.qianzhu.CinemaService;
+import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
@@ -26,11 +24,7 @@ import com.hfkj.sysenum.order.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
diff --git a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java
index 3d6431b..2cb8f42 100644
--- a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java
+++ b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java
@@ -9,8 +9,8 @@ import com.hfkj.common.utils.DateUtil;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderModel;
-import com.hfkj.qianzhu.channel.CinemaService;
-import com.hfkj.qianzhu.channel.StarbucksService;
+import com.hfkj.qianzhu.CinemaService;
+import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.coupon.channel.ChongQingCNPCCouponService;
@@ -19,7 +19,6 @@ import com.hfkj.service.coupon.channel.PcytCNPCCouponConfig;
import com.hfkj.service.coupon.channel.PetroConfig;
import com.hfkj.service.goods.*;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
-import com.hfkj.service.goods.impl.GoodsSpecsServiceImpl;
import com.hfkj.service.hlt.HuiLianTongUnionCardService;
import com.hfkj.sysenum.GoodsVpdSourceEnum;
import com.hfkj.sysenum.order.*;
diff --git a/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java
index c6f8242..37a628a 100644
--- a/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java
+++ b/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java
@@ -1,19 +1,12 @@
package com.hfkj.service.order;
-import com.alibaba.fastjson.JSONObject;
-import com.hfkj.common.exception.ErrorCode;
-import com.hfkj.common.exception.ErrorHelp;
-import com.hfkj.common.exception.SysCode;
-import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
-import com.hfkj.model.order.OrderModel;
-import com.hfkj.qianzhu.channel.CinemaService;
+import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.goods.BsOrderCinemaService;
import com.hfkj.service.goods.BsOrderStarbucksService;
import com.hfkj.service.goods.impl.BsOrderGoodsServiceImpl;
-import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import com.hfkj.sysenum.order.OrderChildStatusEnum;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +15,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
diff --git a/service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java b/service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java
index d0acfb1..8f8267f 100644
--- a/service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/order/impl/BsOrderChildServiceImpl.java
@@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.utils.StarbucksUtil;
import com.hfkj.dao.BsOrderChildMapper;
-import com.hfkj.dao.GoodsUserAddressMapper;
import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
-import com.hfkj.qianzhu.channel.StarbucksService;
+import com.hfkj.qianzhu.StarbucksService;
import com.hfkj.service.BsProductConfigService;
import com.hfkj.service.goods.*;
import com.hfkj.service.goods.impl.BsOrderStarbucksServiceImpl;
@@ -19,7 +18,6 @@ import com.hfkj.sysenum.order.OrderLogisticsStatusEnum;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java
index 3e76adf..fe1f729 100644
--- a/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java
@@ -14,19 +14,14 @@ import com.hfkj.entity.*;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.model.order.OrderModel;
import com.hfkj.mqtopic.OrderTopic;
-import com.hfkj.qianzhu.channel.CinemaService;
-import com.hfkj.qianzhu.channel.StarbucksService;
+import com.hfkj.qianzhu.CinemaService;
import com.hfkj.service.BsProductConfigService;
-import com.hfkj.service.coupon.BsOrderCouponNoService;
-import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.service.discount.CouponDiscountService;
import com.hfkj.service.discount.CouponDiscountUserRelService;
import com.hfkj.service.goods.BsOrderCinemaService;
-import com.hfkj.service.goods.BsOrderGoodsService;
import com.hfkj.service.goods.BsOrderStarbucksService;
import com.hfkj.service.order.*;
import com.hfkj.service.user.UserIntegralService;
-import com.hfkj.service.user.impl.PhgDataUserServiceImpl;
import com.hfkj.sysenum.UserIntegralRecordOpUserTypeEnum;
import com.hfkj.sysenum.UserIntegralRecordSourceTypeEnum;
import com.hfkj.sysenum.order.OrderChildProductTypeEnum;