xc-mall.git - Gitblit

			@@ -368,8 +368,7 @@
			registerDto.setPassword("a123456");
			registerDto.setInviteId(member.getInviteId());
			registerDto.setName(member.getName());
			apiMallMemberService.register(registerDto);
			return new FebsResponse().success();
			return apiMallMemberService.register(registerDto);
			}

			/**

			@@ -128,7 +128,7 @@
			Long subsidyAmountFlowId = mallMoneyFlowService.addMoneyFlow(
			mallMember.getId(),
			orderInfo.getOrderNo(),
			subsidyAmount.setScale(2, BigDecimal.ROUND_DOWN),
			subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN),
			MallMoneyFlowTypeEnum.MARKET_SUBSIDIES.getCode(),
			MallMoneyFlow.STATUS_SUCCESS,
			MallMoneyFlow.IS_RETURN_Y,
			@@ -160,7 +160,7 @@
			DataDictionaryEnum.REWARD_PERCENT.getCode()
			);
			BigDecimal rewardPercent = new BigDecimal(rewardPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
			BigDecimal directRewardAmount = subsidyAmount.multiply(rewardPercent).setScale(2, BigDecimal.ROUND_DOWN);
			BigDecimal directRewardAmount = subsidyAmount.multiply(rewardPercent).setScale(4, BigDecimal.ROUND_DOWN);

			Long marketSubsidyFlowId = mallMoneyFlowService.addMoneyFlow(
			mallMember.getId(),
			@@ -180,7 +180,7 @@
			);
			//生成分享奖励的流水记录
			BigDecimal shareOne = new BigDecimal(shareOneDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
			BigDecimal shareOneAmount = subsidyAmount.multiply(shareOne).setScale(2, BigDecimal.ROUND_DOWN);
			BigDecimal shareOneAmount = subsidyAmount.multiply(shareOne).setScale(4, BigDecimal.ROUND_DOWN);
			Long ShareOneFlowId = mallMoneyFlowService.addMoneyFlow(
			mallMember.getId(),
			orderInfo.getOrderNo(),

	src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java	3 ●●●●● patch \| view \| raw \| blame \| history
	src/test/java/cc/mrbird/febs/ProfitTest.java	6 ●●●●● patch \| view \| raw \| blame \| history