From 1340beb67a9b6d777821d0139bcc7c9b0896ed4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 10:59:26 +0800
Subject: [PATCH] 拼多多比价修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java | 148 ++++++++++++++++++++++++++-----------------------
1 files changed, 78 insertions(+), 70 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java
index e31d5af..60d6ba3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/pdd/PDDOrderServiceImpl.java
@@ -17,80 +17,88 @@
@Service
public class PDDOrderServiceImpl implements PDDOrderService {
- @Resource
- private PDDOrderMapper pddOrderMapper;
+ @Resource
+ private PDDOrderMapper pddOrderMapper;
- @Override
- public PDDOrder addOrder(PDDOrder order) throws PDDOrderException {
- if (order == null || StringUtil.isNullOrEmpty(order.getOrderSn()))
- throw new PDDOrderException(1, "璁㈠崟淇℃伅涓嶅畬鏁�");
+ @Override
+ public PDDOrder addOrder(PDDOrder order) throws PDDOrderException {
+ if (order == null || StringUtil.isNullOrEmpty(order.getOrderSn()))
+ throw new PDDOrderException(1, "璁㈠崟淇℃伅涓嶅畬鏁�");
- PDDOrder old = pddOrderMapper.selectByOrderSN(order.getOrderSn());
- if (old != null) {
- // 鏇存柊璁㈠崟淇℃伅
- if ((order.getOrderStatus().intValue() != old.getOrderStatus())||(old.getOrderStatus()==2 && old.getOrderReceiveTime()==null)) {// 鐘舵�佹敼鍙樹簡鎵嶆洿鏀硅鍗曚俊鎭�
- PDDOrder update = new PDDOrder();
- update.setId(old.getId());
- update.setOrderStatus(order.getOrderStatus());
- update.setOrderAmount(order.getOrderAmount());
- update.setOrderStatusDesc(order.getOrderStatusDesc());
- update.setOrderVerifyTime(order.getOrderVerifyTime());
- update.setOrderGroupSuccessTime(order.getOrderGroupSuccessTime());
- update.setOrderModifyAt(order.getOrderModifyAt());
- update.setOrderPayTime(order.getOrderPayTime());
- update.setOrderSettleTime(order.getOrderSettleTime());
- update.setGoodsName(order.getGoodsName());
- update.setGoodsPrice(order.getGoodsPrice());
- update.setUpdateTime(new Date());
- update.setOrderReceiveTime(order.getOrderReceiveTime());
- pddOrderMapper.updateByPrimaryKeySelective(update);
- return pddOrderMapper.selectByPrimaryKey(old.getId());
- }
- } else {
- if (order.getUpdateTime() == null)
- order.setUpdateTime(new Date());
- if (order.getCreateTime() == null)
- order.setCreateTime(new Date());
- pddOrderMapper.insertSelective(order);
- }
+ PDDOrder old = pddOrderMapper.selectByOrderSN(order.getOrderSn());
+ if (old != null) {
+ // 鏇存柊璁㈠崟淇℃伅
+ if ((order.getOrderStatus().intValue() != old.getOrderStatus()) || (old.getOrderStatus() == 2 && old.getOrderReceiveTime() == null) || !StringUtil.isNullOrEmpty(order.getFailReason())) {// 鐘舵�佹敼鍙樹簡鎵嶆洿鏀硅鍗曚俊鎭�
+ PDDOrder update = new PDDOrder();
+ update.setId(old.getId());
+ update.setOrderStatus(order.getOrderStatus());
+ update.setOrderAmount(order.getOrderAmount());
+ update.setOrderStatusDesc(order.getOrderStatusDesc());
+ update.setFailReason(order.getFailReason());
+ update.setOrderVerifyTime(order.getOrderVerifyTime());
+ update.setOrderGroupSuccessTime(order.getOrderGroupSuccessTime());
+ update.setOrderModifyAt(order.getOrderModifyAt());
+ update.setOrderPayTime(order.getOrderPayTime());
+ update.setOrderSettleTime(order.getOrderSettleTime());
+ update.setGoodsName(order.getGoodsName());
+ update.setGoodsPrice(order.getGoodsPrice());
+ update.setUpdateTime(new Date());
+ update.setOrderReceiveTime(order.getOrderReceiveTime());
+ pddOrderMapper.updateByPrimaryKeySelective(update);
+ return pddOrderMapper.selectByPrimaryKey(old.getId());
+ }
+ } else {
+ if (order.getUpdateTime() == null)
+ order.setUpdateTime(new Date());
+ if (order.getCreateTime() == null)
+ order.setCreateTime(new Date());
+ pddOrderMapper.insertSelective(order);
+ }
- return order;
- }
+ return order;
+ }
- @Override
- public List<PDDOrder> selectByOrderSn(String orderSn) {
- List<PDDOrder> pddList = new ArrayList<>();
- PDDOrder pddOrder = pddOrderMapper.selectByOrderSN(orderSn);
- if (pddOrder != null)
- pddList.add(pddOrder);
- return pddList;
- }
+ @Override
+ public List<PDDOrder> selectByOrderSn(String orderSn) {
+ List<PDDOrder> pddList = new ArrayList<>();
+ PDDOrder pddOrder = pddOrderMapper.selectByOrderSN(orderSn);
+ if (pddOrder != null)
+ pddList.add(pddOrder);
+ return pddList;
+ }
- @Override
- public List<PDDOrder> listByStatus(Integer status, int page, int pageSize) {
- return pddOrderMapper.listByStatus(status, (page - 1) * pageSize, pageSize);
- }
+ @Override
+ public List<PDDOrder> listByOrderSns(List<String> orderSnList) {
+ if (orderSnList == null || orderSnList.size() == 0)
+ return new ArrayList<>();
+ return pddOrderMapper.listByOrderSn(orderSnList);
+ }
-
- @Override
- public Long countOrderByDay(String preDay) {
- return pddOrderMapper.countOrderByDay(preDay);
- }
-
-
- @Override
- public List<PDDOrder> listQuery(long start, int count, String key) {
- return pddOrderMapper.listQuery(start, count, key);
- }
-
- @Override
- public long countQuery(String key) {
- Long count = pddOrderMapper.countQuery(key);
- if (count == null) {
- count = 0L;
- }
- return count;
- }
-
-
+ @Override
+ public List<PDDOrder> listByStatus(Integer status, int page, int pageSize) {
+ return pddOrderMapper.listByStatus(status, (page - 1) * pageSize, pageSize);
+ }
+
+
+ @Override
+ public Long countOrderByDay(String preDay) {
+ return pddOrderMapper.countOrderByDay(preDay);
+ }
+
+
+ @Override
+ public List<PDDOrder> listQuery(long start, int count, String key) {
+ return pddOrderMapper.listQuery(start, count, key);
+ }
+
+ @Override
+ public long countQuery(String key) {
+ Long count = pddOrderMapper.countQuery(key);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+
}
--
Gitblit v1.8.0