From c5b60fbff8008c95cef0236ea520041a43151d19 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 06 Apr 2023 23:03:13 +0800
Subject: [PATCH] 在mq之前，先更新订单状态
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 515 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 440 insertions(+), 75 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index d9bad98..aea0a76 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -14,9 +14,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
-import cc.mrbird.febs.mall.vo.OrderDetailVo;
-import cc.mrbird.febs.mall.vo.OrderListVo;
-import cc.mrbird.febs.mall.vo.OrderRefundVo;
+import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.AgreementPayDto;
import cc.mrbird.febs.pay.model.AgreementSignDto;
import cc.mrbird.febs.pay.model.UnipayDto;
@@ -41,6 +39,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.text.DecimalFormat;
import java.util.*;
@@ -73,6 +72,14 @@
private final IMallAchieveService mallAchieveService;
private final UnipayService unipayService;
+ private final MallMemberBankSignMapper mallMemberBankSignMapper;
+ private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallShopApplyMapper mallShopApplyMapper;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final MallAchieveRecordMapper mallAchieveRecordMapper;
+ private final MallMemberWalletMapper mallMemberWalletMapper;
+ private final MallMqRecordMapper mallMqRecordMapper;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOrder(AddOrderDto addOrderDto) {
@@ -99,6 +106,22 @@
if (CollUtil.isEmpty(addOrderDto.getItems())) {
throw new FebsException("参数错误");
+ }
+
+ int deliverType = ObjectUtil.isEmpty(addOrderDto.getDeliverType()) ? 1 : addOrderDto.getDeliverType();
+ if(2 == deliverType){
+ if(ObjectUtil.isEmpty(addOrderDto.getShopId())){
+ throw new FebsException("请选择门店");
+ }
+ Long shopId = addOrderDto.getShopId();
+ MallShopApply mallShopApply = mallShopApplyMapper.selectById(shopId);
+ if(ObjectUtil.isEmpty(mallShopApply)){
+ throw new FebsException("请选择门店");
+ }
+ if(MallShopApply.APPLY_AGREE != mallShopApply.getStatus()){
+ throw new FebsException("请选择门店");
+ }
+ orderInfo.setShopId(shopId);
}
this.baseMapper.insert(orderInfo);
@@ -181,9 +204,30 @@
}
mallOrderItemMapper.insert(orderItem);
}
-
+ /**
+ * 使用积分折扣现金
+ */
+ DataDictionaryCustom scoreChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_CHANGE.getType(),
+ DataDictionaryEnum.SCORE_CHANGE.getCode()
+ );
+ BigDecimal score = ObjectUtil.isEmpty(addOrderDto.getScore()) ? BigDecimal.ZERO : addOrderDto.getScore();
+ orderInfo.setScoreCnt(score);
+ BigDecimal scoreChange = BigDecimal.ONE;
+ if(ObjectUtil.isNotEmpty(scoreChangeDic)){
+ scoreChange = new BigDecimal(scoreChangeDic.getValue()).abs().setScale(2,BigDecimal.ROUND_DOWN);
+ }
+ //折扣现金
+ BigDecimal scorePercentAmount = score.divide(scoreChange,BigDecimal.ROUND_DOWN).setScale(2,BigDecimal.ROUND_DOWN);
+ orderInfo.setScoreAmount(scorePercentAmount);
orderInfo.setAmount(total);
- orderInfo.setCarriage(carriage);
+ if(2 == deliverType){
+ orderInfo.setDeliverType(2);
+ orderInfo.setCarriage(BigDecimal.ZERO);
+ }else{
+ orderInfo.setDeliverType(1);
+ orderInfo.setCarriage(carriage);
+ }
this.baseMapper.updateById(orderInfo);
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
@@ -209,12 +253,12 @@
this.baseMapper.updateById(orderInfo);
}
- public static void main(String[] args) {
- String unipayStr = "{\"r1_MerchantNo\":\"888118000001971\",\"rd_Pic\":\"\",\"r6_FrpCode\":\"ALIPAY_H5\",\"r7_TrxNo\":\"100222082332490699\",\"r0_Version\":\"1.0\",\"r3_Amount\":\"0.01\",\"r4_Cur\":\"1\",\"r2_OrderNo\":\"2022082212510288174\",\"rb_CodeMsg\":\"\",\"hmac\":\"1659BB77DEDDF9956EA4D6DF227C3B14\",\"ra_Code\":100,\"rc_Result\":\"<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title></title></head><body><script type='text/javascript'>location.href='https://qr.alipay.com/bax019737vbdwoisxcdp00a2';</script></body></html>\"}";
- JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
- String r7_trxNo = (String) jsonObject.get("r7_TrxNo");
- System.out.println(r7_trxNo);
- }
+// public static void main(String[] args) {
+// String unipayStr = "{\"r1_MerchantNo\":\"888118000001971\",\"rd_Pic\":\"\",\"r6_FrpCode\":\"ALIPAY_H5\",\"r7_TrxNo\":\"100222082332490699\",\"r0_Version\":\"1.0\",\"r3_Amount\":\"0.01\",\"r4_Cur\":\"1\",\"r2_OrderNo\":\"2022082212510288174\",\"rb_CodeMsg\":\"\",\"hmac\":\"1659BB77DEDDF9956EA4D6DF227C3B14\",\"ra_Code\":100,\"rc_Result\":\"<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title></title></head><body><script type='text/javascript'>location.href='https://qr.alipay.com/bax019737vbdwoisxcdp00a2';</script></body></html>\"}";
+// JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
+// String r7_trxNo = (String) jsonObject.get("r7_TrxNo");
+// System.out.println(r7_trxNo);
+// }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -233,10 +277,31 @@
String rcResult = "";
switch (payOrderDto.getType()) {
case "1":
+ UnipayDto unipayDtoWx = new UnipayDto();
+// unipayDto.setAmount(new BigDecimal("0.01"));
+ unipayDtoWx.setAmount(orderInfo.getAmount());
+ unipayDtoWx.setFrpCode("WEIXIN_APP3");
+ unipayDtoWx.setTradeMerchantNo("777180800385820");
+ unipayDtoWx.setOrderNo(orderInfo.getOrderNo());
+ List<MallOrderItem> itemsWx = orderInfo.getItems();
+ if(CollUtil.isEmpty(itemsWx)){
+ unipayDtoWx.setProductName("商品");
+ }else{
+ unipayDtoWx.setProductName(itemsWx.get(0).getGoodsName());
+ }
+ String unipayStrWx = unipayService.unipay(unipayDtoWx);
+ if("fail" == unipayStrWx){
+ throw new FebsException("支付失败");
+ }else{
+// JSONUtil.parseObj(unipayStr);
+ JSONObject jsonObject = JSONUtil.parseObj(unipayStrWx);
+ payResultStr = (String) jsonObject.get("r7_TrxNo");
+ rcResult = (String) jsonObject.get("rc_Result");
+ }
+ orderInfo.setPayOrderNo(payResultStr);
// orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
// orderInfo.setPayImage(payOrderDto.getPayImage());
orderInfo.setPayMethod("微信支付");
- agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "2":
// if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
@@ -248,7 +313,7 @@
// unipayDto.setAmount(new BigDecimal("0.01"));
unipayDto.setAmount(orderInfo.getAmount());
unipayDto.setFrpCode("ALIPAY_H5");
- unipayDto.setTradeMerchantNo("777180800385820");
+ unipayDto.setTradeMerchantNo("777184100385821");
unipayDto.setOrderNo(orderInfo.getOrderNo());
List<MallOrderItem> items = orderInfo.getItems();
if(CollUtil.isEmpty(items)){
@@ -277,47 +342,22 @@
orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
orderInfo.setPayTime(new Date());
orderInfo.setPayResult("1");
+ this.baseMapper.updateById(orderInfo);
- boolean hasTc = false;
- // 静态倍数
- List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
- if (CollUtil.isNotEmpty(orderItems)) {
- for (MallOrderItem orderItem : orderItems) {
- MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
- BigDecimal score = BigDecimal.ZERO;
- MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
- if (mallGoods.getIsNormal() == 2) {
- hasTc = true;
- score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt()));
-// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti();
-// score = sku.getPresentPrice().multiply(staticMulti);
- // 普通商品也及时结算，不再10天结算
- } else {
- score = sku.getPresentPrice();
- }
-
- if (score.compareTo(BigDecimal.ZERO) > 0) {
- memberWalletService.add(score, member.getId(), "score");
- mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
-
- // 添加业绩
- mallAchieveService.add(orderItem.getId());
- }
- }
- }
-
- // 购买套餐后，升级为普通会员
- if (hasTc) {
- MallMember mallMember = memberMapper.selectById(member.getId());
- if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
- memberMapper.updateById(mallMember);
- }
- }
-
- mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+ changeWallet(orderInfo.getId());
+ /**
+ * 插入一条待处理记录
+ * mq处理之后，更新状态
+ */
+ MallMqRecord mallMqRecord = new MallMqRecord();
+ mallMqRecord.setOrderId(orderInfo.getId());
+ mallMqRecord.setState(2);
+ mallMqRecord.setRetryTimes(2);
+ mallMqRecordMapper.insert(mallMqRecord);
+ //发送补贴消息
+ agentProducer.sendPerkMoneyMsg(orderInfo.getId());
+ //发送代理自动升级消息
agentProducer.sendAutoLevelUpMsg(member.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -334,25 +374,6 @@
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue());
break;
case "5":
- AgreementSignDto agreementSignDto = new AgreementSignDto();
- agreementSignDto.setOrderNo(orderInfo.getOrderNo());
- agreementSignDto.setSmsCode(payOrderDto.getSmsCode());
- String agreementSignStr = unipayService.agreementSign(agreementSignDto);
- if("fail".equals(agreementSignStr)){
- throw new FebsException("支付失败");
- }else{
- JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
- payResultStr = (String) jsonObject.get("biz_code");
- String signBizMsg = (String) jsonObject.get("biz_msg");
- String err_msg = (String) jsonObject.get("err_msg");
- if(!"JS000000".equals(payResultStr)){
- throw new FebsException(signBizMsg);
- }
- if(ObjectUtil.isNotNull(jsonObject.get("err_code"))){
- throw new FebsException(err_msg);
- }
- }
-
AgreementPayDto agreementPayDto = new AgreementPayDto();
agreementPayDto.setOrderNo(orderInfo.getOrderNo());
@@ -367,10 +388,20 @@
}else{
agreementPayDto.setOrderDesc(itemsGoods.get(0).getGoodsName());
}
- agreementPayDto.setBankNo(payOrderDto.getBankNo());
+ Long bankId = payOrderDto.getBankId() == null ? 0L : payOrderDto.getBankId();
+ MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(bankId);
+ if(ObjectUtil.isEmpty(mallMemberBank)){
+ throw new FebsException("银行卡未添加");
+ }
+ String bankNo = mallMemberBank.getBankNo();
+ MallMemberBankSign mallMemberBankSign = mallMemberBankSignMapper.selectOneByMemberIdAndBankCardNo(member.getId(), bankNo);
+ if(ObjectUtil.isEmpty(mallMemberBankSign)){
+ throw new FebsException("银行卡未签约");
+ }
+ agreementPayDto.setBankNo(bankNo);
String agreementPayStr = unipayService.agreementPay(agreementPayDto);
- if("fail".equals(agreementSignStr)){
+ if("fail".equals(agreementPayStr)){
throw new FebsException("支付失败");
}else{
JSONObject jsonObject = JSONUtil.parseObj(agreementPayStr);
@@ -396,6 +427,220 @@
return map;
}
+ /**
+ * 支付金额后的操作
+ * 减少积分，增加流水
+ * 购买套餐后，升级会员等级
+ * 增加支付金额流水
+ * 增加补贴额度
+ * 增加贡献值，增加流水
+ * 产生一条业绩记录
+ * @param orderId
+ */
+ @Override
+ public void changeWallet(Long orderId){
+ MallOrderInfo orderInfo = this.baseMapper.selectById(orderId);
+ Long memberId = orderInfo.getMemberId();
+ boolean hasTc = false;
+ //总贡献值
+ BigDecimal starSum = BigDecimal.ZERO;
+ /**
+ * 总补贴额度
+ * 所有合伙人补贴至消费礼包的三倍额度需要复购一次。
+ */
+ BigDecimal scoreSum = BigDecimal.ZERO;
+ BigDecimal achieveSum = BigDecimal.ZERO;
+ List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
+ if (CollUtil.isNotEmpty(orderItems)) {
+ for (MallOrderItem orderItem : orderItems) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
+ /**
+ * 购买套餐赠送贡献值
+ * 补贴3倍额度
+ */
+ if (mallGoods.getIsNormal() == 2) {
+ hasTc = true;
+ BigDecimal star = (mallGoods.getStar()==null ? BigDecimal.ZERO : mallGoods.getStar())
+ .multiply(new BigDecimal(orderItem.getCnt()));
+ starSum = starSum.add(star);
+// scoreSum = scoreSum.add(
+// new BigDecimal(mallGoods.getPresentPrice())
+// .multiply(new BigDecimal(3))
+// .multiply(new BigDecimal(orderItem.getCnt()))
+// .abs()
+// .setScale(2,BigDecimal.ROUND_DOWN));
+ String goodsName = mallGoods.getGoodsName();
+ /**
+ * 1-2档投资级别，2.5倍
+ * 3-4档投资级别，2.8倍
+ * 5-6档投资级别，3倍
+ * 目前紧急修改成按照商品名称
+ */
+ BigDecimal basePercent = new BigDecimal("3");
+ if(goodsName.equals("礼包一") || goodsName.equals("礼包二")){
+ basePercent = new BigDecimal("2.5");
+ }
+ if(goodsName.equals("礼包三") || goodsName.equals("礼包四")){
+ basePercent = new BigDecimal("2.8");
+ }
+ if(goodsName.equals("礼包五") || goodsName.equals("礼包六")){
+ basePercent = new BigDecimal("3");
+ }
+ scoreSum = scoreSum.add(
+ new BigDecimal(mallGoods.getPresentPrice())
+ .multiply(new BigDecimal(orderItem.getCnt()))
+ .multiply(basePercent)
+ .abs()
+ .setScale(2,BigDecimal.ROUND_DOWN));
+ achieveSum = achieveSum.add(
+ new BigDecimal(mallGoods.getPresentPrice())
+ .multiply(new BigDecimal(orderItem.getCnt()))
+ .abs()
+ .setScale(2,BigDecimal.ROUND_DOWN));
+ }
+ }
+ /**
+ * 增加贡献值，增加流水
+ */
+ if (starSum.compareTo(BigDecimal.ZERO) > 0) {
+ //系统设置的个人贡献点最大值
+ DataDictionaryCustom starGetDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.STAR_GET.getType(),
+ DataDictionaryEnum.STAR_GET.getCode());
+ if(ObjectUtil.isNotEmpty(starGetDic)){
+ String starGetStr = StrUtil.isEmpty(starGetDic.getValue()) ? "0" : starGetDic.getValue();
+ BigDecimal starGet = new BigDecimal(starGetStr);
+
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ BigDecimal star = new BigDecimal(mallMemberWallet.getStar());
+ if(starGet.compareTo(star.add(starSum)) < 0){
+ if(starGet.compareTo(BigDecimal.ZERO) == 0){
+ mallMemberWalletMapper.addStarByMemberId(starSum.intValue(), memberId);
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ starSum,
+ MoneyFlowTypeEnum.STAR.getValue(),
+ orderInfo.getOrderNo(),
+ FlowTypeEnum.STAR.getValue(),
+ 2);
+ }
+ if(starGet.compareTo(star) > 0){
+ BigDecimal subtract = starGet.subtract(star);
+ if(subtract.compareTo(starSum) < 0){
+ starSum = subtract;
+ }
+ mallMemberWalletMapper.addStarByMemberId(starSum.intValue(), memberId);
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ starSum,
+ MoneyFlowTypeEnum.STAR.getValue(),
+ orderInfo.getOrderNo(),
+ FlowTypeEnum.STAR.getValue(),
+ 2);
+ }
+ }else{
+ mallMemberWalletMapper.addStarByMemberId(starSum.intValue(), memberId);
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ starSum,
+ MoneyFlowTypeEnum.STAR.getValue(),
+ orderInfo.getOrderNo(),
+ FlowTypeEnum.STAR.getValue(),
+ 2);
+ }
+ }
+ }
+ /**
+ * 增加补贴额度
+ */
+ if (scoreSum.compareTo(BigDecimal.ZERO) > 0) {
+// MallMember mallMember = memberMapper.selectById(memberId);
+// if(MemberLevelEnum.SECOND_LEVEL.getLevelCode(mallMember.getLevel()) >= 5){
+// scoreSum = scoreSum.multiply(new BigDecimal(3));
+// }
+// if(MemberLevelEnum.SECOND_LEVEL.getLevelCode(mallMember.getLevel()) >= 3
+// &&MemberLevelEnum.SECOND_LEVEL.getLevelCode(mallMember.getLevel()) < 5){
+// scoreSum = scoreSum.multiply(new BigDecimal(2.8));
+// }
+// if(MemberLevelEnum.SECOND_LEVEL.getLevelCode(mallMember.getLevel()) < 3){
+// scoreSum = scoreSum.multiply(new BigDecimal(2.5));
+// }
+ memberWalletService.add(scoreSum, memberId, "totalScore");
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ scoreSum,
+ MoneyFlowTypeEnum.TOTAL_SCORE.getValue(),
+ orderInfo.getOrderNo(),
+ "",
+ scoreSum.toString(),
+ memberId,
+ 1,
+ FlowTypeEnum.TOTAL_SCORE.getValue(),
+ 2);
+ }
+ }
+
+ /**
+ * 购买套餐后，升级会员等级
+ */
+ if (hasTc) {
+ MallMember mallMember = memberMapper.selectById(memberId);
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
+ mallMember.setLevel(AgentLevelEnum.SECOND_LEVEL.name());
+ memberMapper.updateById(mallMember);
+ }
+ }
+ /**
+ * 增加支付金额流水
+ */
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ orderInfo.getAmount().subtract(orderInfo.getScoreAmount()).negate(),
+ MoneyFlowTypeEnum.PAY.getValue(),
+ orderInfo.getOrderNo(),
+ FlowTypeEnum.BALANCE.getValue());
+ /**
+ * 减少积分，增加流水
+ */
+ int reduce = memberWalletService.reduce(orderInfo.getScoreCnt(), memberId, "prizeScore");
+ if (reduce == 2) {
+ throw new FebsException("积分不足");
+ }
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ orderInfo.getScoreCnt().negate(),
+ MoneyFlowTypeEnum.PAY.getValue(),
+ orderInfo.getOrderNo(),
+ FlowTypeEnum.PRIZE_SCORE.getValue());
+ /**
+ * 产生一条业绩记录
+ */
+ if(achieveSum.compareTo(BigDecimal.ZERO) > 0){
+ MallAchieveRecord mallAchieveRecord = new MallAchieveRecord();
+ mallAchieveRecord.setMemberId(memberId);
+ mallAchieveRecord.setAchieveTime(new Date());
+ mallAchieveRecord.setAmount(achieveSum.subtract(orderInfo.getScoreAmount()));
+ mallAchieveRecord.setOrderId(orderId);
+ mallAchieveRecord.setPayTime(orderInfo.getPayTime());
+ mallAchieveRecordMapper.insert(mallAchieveRecord);
+ }
+ }
+
+ public static void main(String[] args) {
+ String str = "{\"biz_code\":\"JS000000\",\"biz_msg\":\"成功\",\"data\":\"{\\\"order_status\\\":\\\"P2000\\\",\\\"jp_order_no\\\":\\\"100120220826446740396081496064\\\",\\\"err_msg\\\":\\\"短信验证码不符\\\",\\\"err_code\\\":\\\"CP110026\\\",\\\"sign_no\\\":\\\"\\\",\\\"mch_order_no\\\":\\\"NO_2022082618263952399\\\"}\",\"mch_no\":\"888118000001971\",\"rand_str\":\"an2w7ulf5ru6upkk5bdg441kdi3gnpvu\",\"resp_code\":\"SUCCESS\",\"sec_key\":\"\",\"sign\":\"NiJXRTSIZ9xZMUOwEHiEHdZXmgL2cHUU5WUa1NbMRRzui0DIiuZSW4e31LjnBxwVwmy3uuPMP+tqhY8VLyC8uCFOdGdZI7e72VuRvyvaiW7/sqCrsfgPOBEjiGE/CmSMRoEXv9HmqCyNBF6iHSEhQJql5Yge30dQdyB6xFfqjk0=\",\"sign_type\":\"2\"}";
+
+ JSONObject jsonObject = JSONUtil.parseObj(str);
+ String payResultStr = (String) jsonObject.get("biz_code");
+ String signBizMsg = (String) jsonObject.get("biz_msg");
+ String signData = (String) jsonObject.get("data");
+
+ JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
+ String err_msg = (String) signDatajsonObject.get("err_msg");
+ if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
+ System.out.println(err_msg);
+ }
+ }
+
private String balancePay(MallOrderInfo orderInfo, String tradePwd, String field) {
if (StrUtil.isBlank(tradePwd)) {
throw new FebsException("支付密码错误");
@@ -410,7 +655,7 @@
throw new FebsException("支付密码错误");
}
- int reduce = memberWalletService.reduce(orderInfo.getAmount().add(orderInfo.getCarriage()), mallMember.getId(), field);
+ int reduce = memberWalletService.reduce(orderInfo.getAmount().subtract(orderInfo.getScoreAmount()).add(orderInfo.getCarriage()), mallMember.getId(), field);
if (reduce == 2) {
throw new FebsException("余额不足");
}
@@ -437,7 +682,8 @@
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
- if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
+ Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
+ if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
orderDetailVo.setExpressNo(expressInfo.getExpressNo());
orderDetailVo.setExpressCom(expressInfo.getExpressCom());
@@ -454,6 +700,20 @@
long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
orderDetailVo.setRemainTime(remainTime);
+ }
+ if(2 == deliverType){
+ MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
+ if(ObjectUtil.isNotEmpty(mallShopApply)){
+ ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
+ apiShopApplyVo.setName(mallShopApply.getName());
+ apiShopApplyVo.setPhone(mallShopApply.getPhone());
+ apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
+ apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
+ apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
+ apiShopApplyVo.setShopName(mallShopApply.getShopName());
+ apiShopApplyVo.setAddress(mallShopApply.getAddress());
+ orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
+ }
}
return orderDetailVo;
}
@@ -627,4 +887,109 @@
}
}
+ @Override
+ public FebsResponse bangCardSign(BangCardSignDto bangCardSignDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ Long memberId = member.getId();
+ String bankCard = bangCardSignDto.getBankCard();
+ MallMemberBankSign mallMemberBankSign = mallMemberBankSignMapper.selectOneByMemberIdAndBankCardNo(memberId,bankCard);
+ if(ObjectUtil.isNotEmpty(mallMemberBankSign)){
+ return new FebsResponse().success().data(mallMemberBankSign);
+ }else{
+ return new FebsResponse().success();
+ }
+ }
+
+ @Override
+ public FebsResponse judgeCreateOrder(AddOrderDto addOrderDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ if (CollUtil.isEmpty(addOrderDto.getItems())) {
+ throw new FebsException("请选择购买商品");
+ }
+
+ boolean hasTc = false;
+ //总的折扣积分数量
+ BigDecimal total = BigDecimal.ZERO;
+ for (AddOrderItemDto item : addOrderDto.getItems()) {
+ MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
+ if(ObjectUtil.isEmpty(sku)){
+ throw new FebsException("商品已更新，请重新下单");
+ }
+ MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
+ if(ObjectUtil.isEmpty(mallGoods)){
+ throw new FebsException("商品已更新，请重新下单");
+ }
+ /**
+ * 贡献点判断
+ */
+ if (mallGoods.getIsNormal() == 2) {
+ hasTc = true;
+ }
+ /*
+ 获取单个商品的折扣积分数量
+ = 现价 * 数量 * 折扣现金比例
+ */
+ BigDecimal scorePercent = new BigDecimal(mallGoods.getScorePercent()).multiply(new BigDecimal(0.01));
+ BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt())).multiply(scorePercent);
+ total = total.add(amount);
+ }
+
+ BigDecimal score = ObjectUtil.isEmpty(addOrderDto.getScore()) ? BigDecimal.ZERO : addOrderDto.getScore();
+
+ MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
+ BigDecimal prizeScore = mallMemberWallet.getPrizeScore();
+ if(prizeScore.compareTo(score) < 0){
+ throw new FebsException("积分不足");
+ }
+ if(hasTc){
+ //系统设置的个人贡献点最大值
+ DataDictionaryCustom starGetDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.STAR_GET.getType(),
+ DataDictionaryEnum.STAR_GET.getCode());
+ if(ObjectUtil.isNotEmpty(starGetDic)){
+ String starGetStr = StrUtil.isEmpty(starGetDic.getValue()) ? "0" : starGetDic.getValue();
+ BigDecimal starGet = new BigDecimal(starGetStr);
+ BigDecimal star = new BigDecimal(mallMemberWallet.getStar());
+ if(starGet.compareTo(BigDecimal.ZERO) != 0 && starGet.compareTo(star) <= 0){
+ throw new FebsException("无法购买套餐");
+ }
+ }
+ }
+ /**
+ * 使用积分折扣现金
+ */
+ DataDictionaryCustom scoreChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_CHANGE.getType(),
+ DataDictionaryEnum.SCORE_CHANGE.getCode()
+ );
+
+ //最大折扣金额对应需要的总积分数目
+ BigDecimal scorePercentMaxAmount = total;
+ BigDecimal scoreChange = BigDecimal.ONE;
+ if(ObjectUtil.isNotEmpty(scoreChangeDic)){
+ scoreChange = new BigDecimal(scoreChangeDic.getValue()).abs().setScale(2,BigDecimal.ROUND_DOWN);
+ }
+ scorePercentMaxAmount = scorePercentMaxAmount.multiply(scoreChange).setScale(2,BigDecimal.ROUND_DOWN);
+ if(scorePercentMaxAmount.compareTo(score) < 0){
+ throw new FebsException("最多可使用"+scorePercentMaxAmount+"积分");
+ }
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public ApiScoreSetVo myScoreSet() {
+ ApiScoreSetVo apiScoreSetVo = new ApiScoreSetVo();
+ DataDictionaryCustom scorePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_PERCENT.getType(),
+ DataDictionaryEnum.SCORE_PERCENT.getCode()
+ );
+ DataDictionaryCustom scoreChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_CHANGE.getType(),
+ DataDictionaryEnum.SCORE_CHANGE.getCode()
+ );
+ apiScoreSetVo.setScorePercent(new BigDecimal(scorePercentDic.getValue()).multiply(BigDecimal.valueOf(0.01)).setScale(2,BigDecimal.ROUND_DOWN));
+ apiScoreSetVo.setScoreChange(new BigDecimal(scoreChangeDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN));
+ return apiScoreSetVo;
+ }
+
}
--
Gitblit v1.9.1