From ff22b0565c630eb5ee30fdfc30a999a4a4b7651d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 17:51:59 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 153 insertions(+), 10 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 bc917a3..d9771e0 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
@@ -49,6 +49,7 @@
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -82,6 +83,8 @@
@Autowired
private DiscountLogMapper discountLogMapper;
+ @Autowired
+ private DiscountMapper discountMapper;
@Autowired
GoodsorderJoinMapper goodsorderJoinMapper;
@@ -375,6 +378,19 @@
.eq("status",Constants.ZERO)
.orderByAsc("sortnum")
));;
+ homeResponse.setDiscountList(
+ discountMapper.selectList(new QueryWrapper<Discount>().lambda()
+ .eq(Discount::getIsdeleted,Constants.ZERO)
+ .eq(Discount::getStatus,Constants.ZERO)
+ .orderByDesc(Discount::getId)
+ .last(" limit 3 ")
+ )
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(homeResponse.getDiscountList())){
+ for (Discount discount:homeResponse.getDiscountList()) {
+ discount.setDayPrice(discount.getPrice().divide(new BigDecimal(Integer.toString(discount.getUseDays())),2));
+ }
+ }
if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){
homeResponse.getAdList().forEach(i->{
i.setImgfullurl(fullPath + i.getImgurl());
@@ -629,7 +645,7 @@
}
// BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
//閫�娆句箰琛�
-// int type =Constants.formatIntegerNum(refund.getType());
+// int type =Constants.formatIntegerNum(refund.getType());
Goodsorder update = new Goodsorder();
update.setId(goodsorder.getId());
update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
@@ -851,7 +867,6 @@
wrapper.eq(MemberRides::getOrdreId,id);
wrapper.ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
wrapper.selectAll(MemberRides.class)
- .select("select b.device_sn from bikes b where b.isdeleted=0 and b.code = t.bike_code limit 1",MemberRides::getDeviceSn)
.selectAs(BaseParam::getSortnum, MemberRides::getSortnum)
.selectAs(BaseParam::getName, MemberRides::getParamName);
wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
@@ -1105,6 +1120,7 @@
goodsorder.setCreateDate(new Date());
goodsorder.setIsdeleted(Constants.ZERO);
goodsorder.setCode(goodsorder.getId());
+ goodsorder.setType(Constants.ZERO);
goodsorder.setMemberId(memberId);
goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(new BigDecimal(100)));
goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
@@ -1119,16 +1135,101 @@
} catch (Exception e) {
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍙戣捣鏀粯澶辫触~");
}
-
return response;
}
- private Object getWxPayResponse(Goodsorder goodsorder,String openid) throws Exception {
+
+ @Override
+ public Object createDiscountOrderPay(String memberId,String discountId){
+ Member member = memberMapper.selectById(memberId);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛瀵硅薄淇℃伅");
+ }
+ Discount discount = discountMapper.selectById(discountId);
+ this.checkDiscountSaleDate(discount);
+ String discountMemberId = Constants.getUUID();
+ String goodsorderId = Constants.getUUID();
+ DiscountMember discountMember = new DiscountMember();
+ BeanUtils.copyProperties(discount,discountMember);
+ discountMember.setCreator(null);
+ discountMember.setId(discountMemberId);
+ discountMember.setCreateDate(new Date());
+ discountMember.setEditDate(new Date());
+ discountMember.setEditor(null);
+ discountMember.setMemberId(memberId);
+ discountMember.setStatus(Constants.TWO);
+ discountMember.setGoodsorderId(goodsorderId);
+ discountMemberMapper.insert(discountMember);
+
+ Goodsorder goodsorder = new Goodsorder();
+ goodsorder.setId(goodsorderId);
+ goodsorder.setCreateDate(new Date());
+ goodsorder.setIsdeleted(Constants.ZERO);
+ goodsorder.setCode(goodsorder.getId());
+ goodsorder.setMemberId(memberId);
+ goodsorder.setType(Constants.ONE);
+ goodsorder.setMoney(discount.getPrice().multiply(new BigDecimal(100)));
+ goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
+ goodsorder.setPreOrderid(goodsorder.getId());
+ goodsorder.setPayStatus(Constants.goodsorderPayStatus.waitPay);
+ goodsorder.setPayWay(Constants.ZERO);
+ goodsorder.setObjType(Constants.ZERO);
+ goodsorder.setObjId(discount.getId());
+ this.goodsorderMapper.insert(goodsorder);
//璋冭捣鏀粯
- Object response = null;
+ Object response = null;
+ try {
+ response = getWxPayResponse(goodsorder,member.getOpenid());
+ } catch (Exception e) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍙戣捣鏀粯澶辫触~");
+ }
+ return response;
+
+ }
+
+ public void checkDiscountSaleDate(Discount discount){
+ if(Objects.isNull(discount)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌濂楅淇℃伅");
+ }
+ if(!(Constants.equalsInteger(discount.getIsdeleted(),Constants.ZERO)
+ ||Constants.equalsInteger(discount.getStatus(),Constants.ZERO))){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"濂楅宸蹭笅鏋讹紝鏃犳硶杩涜璐拱锛岃鍒锋柊鏌ョ湅");
+ }
+ if(!(discount.getStartDate().getTime() < System.currentTimeMillis()
+ && Utils.Date.getEnd(discount.getEndDate()).getTime() > System.currentTimeMillis() )){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"濂楅寮�鏀炬椂闂存湭鍒�,鏃犳硶杩涜璐拱");
+ }
+ //楠岃瘉鏄惁瓒呰繃浠婃棩鍙敭鍗栨暟閲�
+ if(Objects.nonNull(discount.getSaleDayLimit())){
+ if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
+ .eq(Goodsorder::getType,Constants.ONE)
+ .eq(Goodsorder::getObjId,discount.getId())
+ .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE)
+ .apply(" EXTRACT(DAY FROM create_date) = EXTRACT(DAY FROM CURRENT_DATE) ")
+ )>=discount.getSaleDayLimit()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"濂楅浠婃棩鍙戣閲忓凡鍞絼锛岃鏄庢棩鏌ョ湅锛�");
+ }
+ }
+ if(Objects.nonNull(discount.getSaleLimit())){
+ if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
+ .eq(Goodsorder::getType,Constants.ONE)
+ .eq(Goodsorder::getObjId,discount.getId())
+ .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE)
+ .apply(" EXTRACT(YEAR FROM create_date) = EXTRACT(YEAR FROM CURRENT_DATE) ")
+ )>=discount.getSaleDayLimit()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"濂楅鍙戣閲忓凡鍞絼锛�");
+ }
+ }
+ }
+
+
+
+ private Object getWxPayResponse(Goodsorder goodsorder,String openid){
+ //璋冭捣鏀粯
+ Object response = null;
PrepayRequest request = new PrepayRequest();
request.setAttach("createGoodsOrder");
- request.setDescription("妫灄鍏洯鑷杞﹂獞琛屾娂閲戞敮浠�");
+ request.setDescription(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)?"妫灄鍏洯鑷杞﹂獞琛屾娂閲戞敮浠�":"妫灄鍏洯鑷杞﹁喘涔伴獞琛屽椁愭敮浠�");
request.setSpMchid(WxMiniConfig.wxProperties.getMchId());
request.setSpAppid(WxMiniConfig.wxProperties.getAppId());
request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
@@ -1145,10 +1246,10 @@
// 璺熶箣鍓嶄笅鍗曠ず渚嬩竴鏍凤紝濉厖棰勪笅鍗曞弬鏁�
PrepayWithRequestPaymentResponse resParam = WxMiniConfig.jsapiExtService.prepayWithRequestPayment(request,WxMiniConfig.wxProperties.getSubAppId());
response =resParam;
-
return response;
-
}
+
+
/**
@@ -1274,6 +1375,50 @@
return ("澶勭悊鎴愬姛!");
}
goodsorder.setOnlineOrderid(paymentNo);
+ if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
+ this.dealGoodsOrderCallBack(goodsorder);
+ }else{
+ this.dealDiscountOrderCallBack(goodsorder);
+ }
+ return ("澶勭悊鎴愬姛!");
+ }
+
+ public void dealDiscountOrderCallBack(Goodsorder goodsorder){
+ goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
+ goodsorder.setStatus(Constants.goodsorderStatus.pay);
+ goodsorder.setPayDate(new Date());
+ goodsorder.setEditDate(new Date());
+ goodsorderMapper.updateById(goodsorder);
+
+ DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda()
+ .eq(DiscountMember::getGoodsorderId,goodsorder.getId()).last(" limit 1 "));
+ discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda()
+ .set(DiscountMember::getStatus,Constants.ZERO)
+ .eq(DiscountMember::getId,discountMember.getId())
+ );
+ Constants.TRANSACTIONS_TYPE discountConstants = Constants.TRANSACTIONS_TYPE.DISCOUNT;
+ //瀛樺偍浜ゆ槗娴佹按琛�
+ 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(discountConstants.getKey());
+ transactions.setPreOrderid(goodsorder.getPreOrderid());
+ transactions.setOnlineOrderid(goodsorder.getOnlineOrderid());
+ transactions.setDoneDate(new Date());
+ transactions.setTitle(discountConstants.getName());
+ transactions.setContent(discountConstants.getInfo());
+ //transactions.setContent(discountMember.getName() +" 鏈夋晥鏈�" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd"));
+ transactions.setBalance(goodsorder.getMoney());
+ transactions.setObjId(discountMember.getId());
+ transactions.setObjType(Constants.TWO);
+ transactionsMapper.insert(transactions);
+ }
+
+
+ public void dealGoodsOrderCallBack(Goodsorder goodsorder){
goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
goodsorder.setStatus(Constants.goodsorderStatus.pay);
goodsorder.setPayDate(new Date());
@@ -1296,9 +1441,7 @@
transactions.setObjId(goodsorder.getId());
transactions.setObjType(Constants.ZERO);
transactionsMapper.insert(transactions);
- return ("澶勭悊鎴愬姛!");
}
-
/**
--
Gitblit v1.9.3