From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java | 104 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 65 insertions(+), 39 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java
index 002268e..0f67161 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java
@@ -32,6 +32,7 @@
import com.java110.po.chargeMachinePort.ChargeMachinePortPo;
import com.java110.po.couponPropertyUser.CouponPropertyUserPo;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.lock.DistributedLock;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
@@ -237,16 +238,17 @@
}
resultVo.setData(orderId);
+ double couponDurationHours = 0.0;
//鎵ｆ
- if (!reqJson.containsKey("couponIds") || StringUtil.isEmpty(reqJson.getString("couponIds"))) {
- // todo 3.0 璐︽埛鎵ｆ
- withholdAccount(reqJson, chargeMachineDtos, orderId);
- context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
- return;
+ if (reqJson.containsKey("couponIds") && !StringUtil.isEmpty(reqJson.getString("couponIds"))) {
+ //todo 浼樻儬鍒告姷鎵�
+ couponDurationHours = withholdCoupon(reqJson, chargeMachineDtos, orderId);
}
- //todo 浼樻儬鍒告姷鎵�
- withholdCoupon(reqJson, chargeMachineDtos, orderId);
+ if(durationHours - couponDurationHours >0) {
+ // todo 3.0 璐︽埛鎵ｆ
+ withholdAccount(reqJson, chargeMachineDtos, orderId,durationHours,couponDurationHours);
+ }
context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
}
@@ -258,39 +260,47 @@
* @param chargeMachineDtos
* @param orderId
*/
- private void withholdCoupon(JSONObject reqJson, List<ChargeMachineDto> chargeMachineDtos, String orderId) {
+ private double withholdCoupon(JSONObject reqJson, List<ChargeMachineDto> chargeMachineDtos, String orderId) {
int flag;
double hours = 0;
String couponNames = "";
for (String couponId : reqJson.getString("couponIds").split(",")) {
+ String requestId = DistributedLock.getLockUUID();
+ String key = this.getClass().getSimpleName() + reqJson.getString("couponId");
+ try {
+ CouponPropertyUserDto couponPropertyUserDto = new CouponPropertyUserDto();
+ couponPropertyUserDto.setCouponId(couponId);
+ couponPropertyUserDto.setToType(CouponPropertyUserDto.TO_TYPE_CHARGE);
+ couponPropertyUserDto.setState(CouponPropertyUserDto.STATE_WAIT);
- CouponPropertyUserDto couponPropertyUserDto = new CouponPropertyUserDto();
- couponPropertyUserDto.setCouponId(couponId);
- couponPropertyUserDto.setToType(CouponPropertyUserDto.TO_TYPE_CHARGE);
- couponPropertyUserDto.setState(CouponPropertyUserDto.STATE_WAIT);
+ List<CouponPropertyUserDto> couponPropertyUserDtos = couponPropertyUserV1InnerServiceSMOImpl.queryCouponPropertyUsers(couponPropertyUserDto);
+ int stock = Integer.parseInt(couponPropertyUserDtos.get(0).getStock());
+ CouponPropertyUserPo couponPropertyUserPo = new CouponPropertyUserPo();
+ couponPropertyUserPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());
+ couponPropertyUserPo.setCommunityId(couponPropertyUserDtos.get(0).getCommunityId());
+ couponPropertyUserPo.setStock((stock - 1) + "");
+ if (stock == 1) {
+ couponPropertyUserPo.setState(CouponPropertyUserDto.STATE_FINISH);
+ }
+ flag = couponPropertyUserV1InnerServiceSMOImpl.updateCouponPropertyUser(couponPropertyUserPo);
+ if (flag < 1) {
+ throw new CmdException("鏍搁攢澶辫触");
+ }
- List<CouponPropertyUserDto> couponPropertyUserDtos = couponPropertyUserV1InnerServiceSMOImpl.queryCouponPropertyUsers(couponPropertyUserDto);
+ couponNames += ("浼樻儬鍒稿悕绉帮細" + couponPropertyUserDtos.get(0).getCouponName() + ",浼樻儬鍒哥紪鍙凤細" + couponId + ";");
- CouponPropertyUserPo couponPropertyUserPo = new CouponPropertyUserPo();
- couponPropertyUserPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());
- couponPropertyUserPo.setCommunityId(couponPropertyUserDtos.get(0).getCommunityId());
- couponPropertyUserPo.setState(CouponPropertyUserDto.STATE_FINISH);
- flag = couponPropertyUserV1InnerServiceSMOImpl.updateCouponPropertyUser(couponPropertyUserPo);
- if (flag < 1) {
- throw new CmdException("鏍搁攢澶辫触");
+ CouponPropertyPoolConfigDto couponPropertyPoolConfigDto = new CouponPropertyPoolConfigDto();
+ couponPropertyPoolConfigDto.setCouponId(couponPropertyUserDtos.get(0).getCppId());
+ couponPropertyPoolConfigDto.setColumnKey("hours");
+ List<CouponPropertyPoolConfigDto> couponPropertyPoolConfigDtos = couponPropertyPoolConfigV1InnerServiceSMOImpl.queryCouponPropertyPoolConfigs(couponPropertyPoolConfigDto);
+
+ Assert.listOnlyOne(couponPropertyPoolConfigDtos, "鏈寘鍚紭鎯犲埜閰嶇疆淇℃伅");
+
+ double value = Double.parseDouble(couponPropertyPoolConfigDtos.get(0).getColumnValue());
+ hours += value;
+ } finally {
+ DistributedLock.releaseDistributedLock(requestId, key);
}
-
- couponNames += ("浼樻儬鍒稿悕绉帮細" + couponPropertyUserDtos.get(0).getCouponName() + ",浼樻儬鍒哥紪鍙凤細" + couponId + ";");
-
- CouponPropertyPoolConfigDto couponPropertyPoolConfigDto = new CouponPropertyPoolConfigDto();
- couponPropertyPoolConfigDto.setCouponId(couponPropertyUserDtos.get(0).getCppId());
- couponPropertyPoolConfigDto.setColumnKey("hours");
- List<CouponPropertyPoolConfigDto> couponPropertyPoolConfigDtos = couponPropertyPoolConfigV1InnerServiceSMOImpl.queryCouponPropertyPoolConfigs(couponPropertyPoolConfigDto);
-
- Assert.listOnlyOne(couponPropertyPoolConfigDtos, "鏈寘鍚紭鎯犲埜閰嶇疆淇℃伅");
-
- double value = Double.parseDouble(couponPropertyPoolConfigDtos.get(0).getColumnValue());
- hours += value;
}
hours = Math.ceil(hours);
@@ -308,6 +318,8 @@
chargeMachineOrderAcctPo.setEnergy("0");
chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
+
+ return hours;
}
/**
@@ -317,28 +329,42 @@
* @param chargeMachineDtos
* @param orderId
*/
- private void withholdAccount(JSONObject reqJson, List<ChargeMachineDto> chargeMachineDtos, String orderId) {
+ private void withholdAccount(JSONObject reqJson, List<ChargeMachineDto> chargeMachineDtos, String orderId ,double durationHours,double couponDurationHours) {
AccountDto accountDto = new AccountDto();
accountDto.setAcctId(reqJson.getString("acctId"));
List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
+
+ double amount = 0.0;
+ BigDecimal durationPrice = new BigDecimal(Double.parseDouble(chargeMachineDtos.get(0).getDurationPrice()));
+ if(couponDurationHours >0) {
+ durationPrice = durationPrice.multiply(new BigDecimal(durationHours - couponDurationHours)).setScale(2,BigDecimal.ROUND_HALF_UP);
+ amount = durationPrice.doubleValue();
+ }else{
+ durationPrice = durationPrice.multiply(new BigDecimal(durationHours)).setScale(2,BigDecimal.ROUND_HALF_UP);
+ amount = durationPrice.doubleValue();
+ }
AccountDetailPo accountDetailPo = new AccountDetailPo();
accountDetailPo.setAcctId(accountDtos.get(0).getAcctId());
accountDetailPo.setObjId(accountDtos.get(0).getObjId());
accountDetailPo.setObjType(accountDtos.get(0).getObjType());
- accountDetailPo.setAmount(chargeMachineDtos.get(0).getDurationPrice());
+ accountDetailPo.setAmount(amount+"");
accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
accountInnerServiceSMOImpl.withholdAccount(accountDetailPo);
-
ChargeMachineOrderAcctPo chargeMachineOrderAcctPo = new ChargeMachineOrderAcctPo();
chargeMachineOrderAcctPo.setAcctDetailId(accountDetailPo.getDetailId());
- chargeMachineOrderAcctPo.setAmount(chargeMachineDtos.get(0).getDurationPrice());
+ chargeMachineOrderAcctPo.setAmount(amount+"");
+
chargeMachineOrderAcctPo.setCmoaId(GenerateCodeFactory.getGeneratorId("11"));
chargeMachineOrderAcctPo.setOrderId(orderId);
chargeMachineOrderAcctPo.setAcctId(accountDtos.get(0).getAcctId());
- chargeMachineOrderAcctPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- chargeMachineOrderAcctPo.setEndTime(DateUtil.getAddHoursStringA(DateUtil.getCurrentDate(), 1));
- chargeMachineOrderAcctPo.setRemark("涓�灏忔椂瀹氭椂鎵ｆ");
+ if(couponDurationHours >0) {
+ chargeMachineOrderAcctPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ }else{
+ chargeMachineOrderAcctPo.setStartTime(DateUtil.getAddHoursStringA(DateUtil.getCurrentDate(), new Double(Math.ceil(couponDurationHours)).intValue()));
+ }
+ chargeMachineOrderAcctPo.setEndTime(DateUtil.getAddHoursStringA(DateUtil.getCurrentDate(), new Double(Math.ceil(durationHours)).intValue()));
+ chargeMachineOrderAcctPo.setRemark("璐︽埛鎵ｆ");
chargeMachineOrderAcctPo.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
chargeMachineOrderAcctPo.setEnergy("0");
--
Gitblit v1.8.0