From 4c96a8cf1eabd61c681ac9af538b9812a06f380b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 09 十月 2023 14:47:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 4a7c2cf..ca87427 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -222,8 +222,8 @@
}
return homeResponse;
}
-
-
+ @Autowired
+ private TransactionsMapper transactionsMapper;
@Override
@@ -350,11 +350,6 @@
.eq(MemberRides::getOrdreId,id);
List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
if (!CollectionUtils.isEmpty(memberRides)){
- boolean exitUnBack = memberRides.stream().anyMatch(s -> !Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey().equals(s.getStatus()));
- if (exitUnBack){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璁㈠崟鏈夋湭瀹屾垚鐨勯獞琛岋紝鏃犳硶寮哄埗缁撶畻");
- }
-
PricingRuleDTO pricingRule = pricingRuleService.getPricingRule(memberRides);
RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
List<MemberRidesResponse> collect = memberRides.stream().map(s -> {
@@ -445,6 +440,23 @@
goodsorder.setPayDate(new Date());
goodsorder.setEditDate(new Date());
goodsorderMapper.updateById(goodsorder);
+ //瀛樺偍浜ゆ槗娴佹按琛�
+ Transactions transactions = new Transactions();
+ transactions.setMemberId(goodsorder.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(goodsorder.getId());
+ transactions.setMoney(goodsorder.getMoney());
+ transactions.setType(Constants.transactionsType.deposit);
+ transactions.setPreOrderid(goodsorder.getPreOrderid());
+ transactions.setOnlineOrderid(goodsorder.getOnlineOrderid());
+ transactions.setDoneDate(new Date());
+ transactions.setTitle("鏀粯");
+ transactions.setContent("鎶奸噾鏀粯");
+ transactions.setBalance(goodsorder.getMoney());
+ transactions.setObjId(goodsorder.getId());
+ transactions.setObjType(Constants.ZERO);
+ transactionsMapper.insert(transactions);
return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
}
--
Gitblit v1.9.3