xc-mall.git - Gitblit

			@@ -18,6 +18,7 @@
			import cc.mrbird.febs.pay.model.AgreementPayDto;
			import cc.mrbird.febs.pay.model.AgreementSignDto;
			import cc.mrbird.febs.pay.model.UnipayDto;
			import cc.mrbird.febs.pay.service.IAliPayService;
			import cc.mrbird.febs.pay.service.IPayService;
			import cc.mrbird.febs.pay.service.UnipayService;
			import cc.mrbird.febs.rabbit.producter.AgentProducer;
			@@ -68,9 +69,10 @@
			private final RedisUtils redisUtils;

			private final AgentProducer agentProducer;
			private final IPayService payService;
			private final IAliPayService payService;
			private final IMallAchieveService mallAchieveService;
			private final UnipayService unipayService;
			private final IPayService wechatPayService;

			private final MallMemberBankSignMapper mallMemberBankSignMapper;
			private final MallMemberBankMapper mallMemberBankMapper;
			@@ -78,6 +80,7 @@
			private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
			private final MallAchieveRecordMapper mallAchieveRecordMapper;
			private final MallMemberWalletMapper mallMemberWalletMapper;
			private final MallMqRecordMapper mallMqRecordMapper;

			@Override
			@Transactional(rollbackFor = Exception.class)
			@@ -276,31 +279,17 @@
			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("商品");
			orderInfo.setName("商品");
			}else{
			unipayDtoWx.setProductName(itemsWx.get(0).getGoodsName());
			orderInfo.setName(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");
			}

			payResultStr = wechatPayService.pay(orderInfo);
			orderInfo.setPayOrderNo(payResultStr);
			// orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
			// orderInfo.setPayImage(payOrderDto.getPayImage());
			orderInfo.setPayMethod("微信支付");
			orderInfo.setPayResult("2");
			break;
			case "2":
			// if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
			@@ -341,8 +330,18 @@
			orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
			orderInfo.setPayTime(new Date());
			orderInfo.setPayResult("1");
			this.baseMapper.updateById(orderInfo);

			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());
			//发送代理自动升级消息
			@@ -438,6 +437,7 @@
			* 所有合伙人补贴至消费礼包的三倍额度需要复购一次。
			*/
			BigDecimal scoreSum = BigDecimal.ZERO;
			BigDecimal achieveSum = BigDecimal.ZERO;
			List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
			if (CollUtil.isNotEmpty(orderItems)) {
			for (MallOrderItem orderItem : orderItems) {
			@@ -451,9 +451,37 @@
			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(3))
			.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));
			@@ -481,7 +509,8 @@
			starSum,
			MoneyFlowTypeEnum.STAR.getValue(),
			orderInfo.getOrderNo(),
			FlowTypeEnum.STAR.getValue());
			FlowTypeEnum.STAR.getValue(),
			2);
			}
			if(starGet.compareTo(star) > 0){
			BigDecimal subtract = starGet.subtract(star);
			@@ -494,7 +523,8 @@
			starSum,
			MoneyFlowTypeEnum.STAR.getValue(),
			orderInfo.getOrderNo(),
			FlowTypeEnum.STAR.getValue());
			FlowTypeEnum.STAR.getValue(),
			2);
			}
			}else{
			mallMemberWalletMapper.addStarByMemberId(starSum.intValue(), memberId);
			@@ -503,7 +533,8 @@
			starSum,
			MoneyFlowTypeEnum.STAR.getValue(),
			orderInfo.getOrderNo(),
			FlowTypeEnum.STAR.getValue());
			FlowTypeEnum.STAR.getValue(),
			2);
			}
			}
			}
			@@ -511,13 +542,29 @@
			* 增加补贴额度
			*/
			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(),
			FlowTypeEnum.TOTAL_SCORE.getValue());
			"",
			scoreSum.toString(),
			memberId,
			1,
			FlowTypeEnum.TOTAL_SCORE.getValue(),
			2);
			}
			}

			@@ -556,13 +603,15 @@
			/**
			* 产生一条业绩记录
			*/
			MallAchieveRecord mallAchieveRecord = new MallAchieveRecord();
			mallAchieveRecord.setMemberId(memberId);
			mallAchieveRecord.setAchieveTime(new Date());
			mallAchieveRecord.setAmount(orderInfo.getAmount().subtract(orderInfo.getScoreAmount()));
			mallAchieveRecord.setOrderId(orderId);
			mallAchieveRecord.setPayTime(orderInfo.getPayTime());
			mallAchieveRecordMapper.insert(mallAchieveRecord);
			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) {
			@@ -851,7 +900,13 @@
			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("商品已更新，请重新下单");
			}
			/**
			* 贡献点判断
			*/
			@@ -868,6 +923,12 @@
			}

			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(
			@@ -876,15 +937,9 @@
			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(BigDecimal.ZERO) != 0 && starGet.compareTo(star) <= 0){
			throw new FebsException("无法购买套餐");
			}
			BigDecimal prizeScore = mallMemberWallet.getPrizeScore();
			if(prizeScore.compareTo(score) < 0){
			throw new FebsException("积分不足");
			}
			}
			}