From 42411e4a26461229c6bca6e89ca55e98a80f5a4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 九月 2021 18:08:17 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java | 250 +++++++++++++++++++++++++-------------------------
1 files changed, 125 insertions(+), 125 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java
index 3e60d82..fff93fa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java
@@ -22,147 +22,147 @@
@Service
public class VipShopOrderServiceImpl implements VipShopOrderService {
- @Resource
- private VipShopOrderMapper vipShopOrderMapper;
+ @Resource
+ private VipShopOrderMapper vipShopOrderMapper;
- @Resource
- private VipShopOrderDetailMapper vipShopOrderDetailMapper;
+ @Resource
+ private VipShopOrderDetailMapper vipShopOrderDetailMapper;
- @Resource
- private VipShopAfterSaleDetailInfoMapper vipShopAfterSaleDetailInfoMapper;
+ @Resource
+ private VipShopAfterSaleDetailInfoMapper vipShopAfterSaleDetailInfoMapper;
- @Override
- public void addOrder(VipShopOrder order) throws VipShopOrderException {
+ @Override
+ public void addOrder(VipShopOrder order) throws VipShopOrderException {
- if (order == null || StringUtil.isNullOrEmpty(order.getOrderSn())) {
- throw new VipShopOrderException(1, "鏁版嵁涓嶅畬鏁�");
- }
+ if (order == null || StringUtil.isNullOrEmpty(order.getOrderSn())) {
+ throw new VipShopOrderException(1, "鏁版嵁涓嶅畬鏁�");
+ }
- // 鏌ヨ鏄惁娣诲姞杩�
- VipShopOrder old = vipShopOrderMapper.selectByOrderSn(order.getOrderSn());
- if (old == null) {// 鏂板
- // 娣诲姞淇℃伅
- if (order.getCreateTime() == null)
- order.setCreateTime(new Date());
- vipShopOrderMapper.insertSelective(order);
- } else {// 鏇存柊
- order.setId(old.getId());
- order.setUpdateTime(new Date());
- vipShopOrderMapper.updateByPrimaryKeySelective(order);
- }
+ // 鏌ヨ鏄惁娣诲姞杩�
+ VipShopOrder old = vipShopOrderMapper.selectByOrderSn(order.getOrderSn());
+ if (old == null) {// 鏂板
+ // 娣诲姞淇℃伅
+ if (order.getCreateTime() == null)
+ order.setCreateTime(new Date());
+ vipShopOrderMapper.insertSelective(order);
+ } else {// 鏇存柊
+ order.setId(old.getId());
+ order.setUpdateTime(new Date());
+ vipShopOrderMapper.updateByPrimaryKeySelective(order);
+ }
- for (VipShopOrderDetail detail : order.getDetailList()) {
- detail.setIdentifyCode(VipShopUtil.getOrderDetailIdentifyCode(order.getOrderSn(), detail.getGoodsId(),
- detail.getSizeId()));
- detail.setOrderSn(order.getOrderSn());
- addOrderDetail(detail);
- }
- }
+ for (VipShopOrderDetail detail : order.getDetailList()) {
+ detail.setIdentifyCode(VipShopUtil.getOrderDetailIdentifyCode(order.getOrderSn(), detail.getGoodsId(),
+ detail.getSizeId()));
+ detail.setOrderSn(order.getOrderSn());
+ addOrderDetail(detail);
+ }
+ }
- /**
- * 娣诲姞璇︽儏淇℃伅
- * @Title: addOrderDetail
- * @Description:
- * @param detail
- * void 杩斿洖绫诲瀷
- * @throws
- */
- private void addOrderDetail(VipShopOrderDetail detail) {
- VipShopOrderDetail old = vipShopOrderDetailMapper.selectByIdentifyCode(detail.getIdentifyCode());
- Long detailId = null;
- if (old == null) {
- if (detail.getCreateTime() == null)
- detail.setCreateTime(new Date());
- vipShopOrderDetailMapper.insertSelective(detail);
- detailId = detail.getId();
- } else {
- detail.setId(old.getId());
- detail.setUpdateTime(new Date());
- vipShopOrderDetailMapper.updateByPrimaryKey(detail);
- detailId = detail.getId();
- }
+ /**
+ * 娣诲姞璇︽儏淇℃伅
+ *
+ * @param detail void 杩斿洖绫诲瀷
+ * @throws
+ * @Title: addOrderDetail
+ * @Description:
+ */
+ private void addOrderDetail(VipShopOrderDetail detail) {
+ VipShopOrderDetail old = vipShopOrderDetailMapper.selectByIdentifyCode(detail.getIdentifyCode());
+ Long detailId = null;
+ if (old == null) {
+ if (detail.getCreateTime() == null)
+ detail.setCreateTime(new Date());
+ vipShopOrderDetailMapper.insertSelective(detail);
+ detailId = detail.getId();
+ } else {
+ detail.setId(old.getId());
+ detail.setUpdateTime(new Date());
+ vipShopOrderDetailMapper.updateByPrimaryKey(detail);
+ detailId = detail.getId();
+ }
- if (detail.getAfterSaleInfo() != null)
- for (VipShopAfterSaleDetailInfo info : detail.getAfterSaleInfo()) {
- info.setOrderDetailId(detailId);
- addAfterSaleDetailInfo(info);
- }
- }
+ if (detail.getAfterSaleInfo() != null)
+ for (VipShopAfterSaleDetailInfo info : detail.getAfterSaleInfo()) {
+ info.setOrderDetailId(detailId);
+ addAfterSaleDetailInfo(info);
+ }
+ }
- /**
- * 娣诲姞鍞悗淇℃伅
- * @Title: addAfterSaleDetailInfo
- * @Description:
- * @param detailInfo
- * void 杩斿洖绫诲瀷
- * @throws
- */
- private void addAfterSaleDetailInfo(VipShopAfterSaleDetailInfo detailInfo) {
- VipShopAfterSaleDetailInfo oldInfo = vipShopAfterSaleDetailInfoMapper.selectByOrderDetailId(detailInfo.getId());
- if (oldInfo == null) {
- if (detailInfo.getCreateTime() == null)
- detailInfo.setCreateTime(new Date());
- vipShopAfterSaleDetailInfoMapper.insertSelective(detailInfo);
- } else {
- detailInfo.setId(oldInfo.getId());
- detailInfo.setUpdateTime(new Date());
- vipShopAfterSaleDetailInfoMapper.updateByPrimaryKeySelective(detailInfo);
- }
- }
+ /**
+ * 娣诲姞鍞悗淇℃伅
+ *
+ * @param detailInfo void 杩斿洖绫诲瀷
+ * @throws
+ * @Title: addAfterSaleDetailInfo
+ * @Description:
+ */
+ private void addAfterSaleDetailInfo(VipShopAfterSaleDetailInfo detailInfo) {
+ VipShopAfterSaleDetailInfo oldInfo = vipShopAfterSaleDetailInfoMapper.selectByOrderDetailId(detailInfo.getId());
+ if (oldInfo == null) {
+ if (detailInfo.getCreateTime() == null)
+ detailInfo.setCreateTime(new Date());
+ vipShopAfterSaleDetailInfoMapper.insertSelective(detailInfo);
+ } else {
+ detailInfo.setId(oldInfo.getId());
+ detailInfo.setUpdateTime(new Date());
+ vipShopAfterSaleDetailInfoMapper.updateByPrimaryKeySelective(detailInfo);
+ }
+ }
- @Override
- public VipShopOrder selectByPrimaryKey(Long orderId) {
+ @Override
+ public VipShopOrder selectByPrimaryKey(Long orderId) {
- return vipShopOrderMapper.selectByPrimaryKey(orderId);
- }
+ return vipShopOrderMapper.selectByPrimaryKey(orderId);
+ }
- @Override
- public List<VipShopOrder> listByOrderSn(String orderSn) {
- List<VipShopOrder> list = new ArrayList<>();
- VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
- if (order == null)
- return null;
- list.add(order);
- return list;
- }
+ @Override
+ public List<VipShopOrder> listByOrderSn(String orderSn) {
+ List<VipShopOrder> list = new ArrayList<>();
+ VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
+ if (order == null)
+ return null;
+ list.add(order);
+ return list;
+ }
- @Override
- public List<VipShopOrder> listDetailByOrderSn(String orderSn) {
- List<VipShopOrder> list = new ArrayList<>();
- VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
- if (order == null)
- return null;
- order = selectDetailByPrimaryKey(order.getId());
- list.add(order);
- return list;
- }
+ @Override
+ public List<VipShopOrder> listDetailByOrderSn(String orderSn) {
+ List<VipShopOrder> list = new ArrayList<>();
+ VipShopOrder order = vipShopOrderMapper.selectByOrderSn(orderSn);
+ if (order == null)
+ return null;
+ order = selectDetailByPrimaryKey(order.getId());
+ list.add(order);
+ return list;
+ }
- @Override
- public VipShopOrder selectDetailByPrimaryKey(Long orderId) {
- VipShopOrder order = vipShopOrderMapper.selectByPrimaryKey(orderId);
- if (order == null)
- return null;
- List<VipShopOrderDetail> detailList = vipShopOrderDetailMapper.listByOrderSn(order.getOrderSn());
- order.setDetailList(detailList);
- return order;
- }
+ @Override
+ public VipShopOrder selectDetailByPrimaryKey(Long orderId) {
+ VipShopOrder order = vipShopOrderMapper.selectByPrimaryKey(orderId);
+ if (order == null)
+ return null;
+ List<VipShopOrderDetail> detailList = vipShopOrderDetailMapper.listByOrderSn(order.getOrderSn());
+ order.setDetailList(detailList);
+ return order;
+ }
- @Override
- public Long countOrderByDay(String preDay) {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public Long countOrderByDay(String preDay) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public List<VipShopOrderDetail> listDetailQuery(long start, int count, String key) {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ public List<VipShopOrderDetail> listDetailQuery(long start, int count, String key) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- public long countDetailQuery(String key) {
- // TODO Auto-generated method stub
- return 0;
- }
+ @Override
+ public long countDetailQuery(String key) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
}
--
Gitblit v1.8.0