java/JiaDianHuiShou.git

			@@ -408,7 +408,7 @@


			TFranchiseeBalanceChange tFranchiseeBalanceChange = new TFranchiseeBalanceChange();
			tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
			tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9962")).setScale(2,BigDecimal.ROUND_DOWN));
			tFranchiseeBalanceChange.setIs_pay(0);
			tFranchiseeBalanceChange.setFranchiseeName(byId.getName());
			tFranchiseeBalanceChange.setFranchiseeId(String.valueOf(byId.getId()));
			@@ -451,7 +451,7 @@
			BigDecimal money = new BigDecimal(2);


			System.err.println(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
			System.err.println(money.multiply(new BigDecimal("0.9962")).setScale(2,BigDecimal.ROUND_DOWN));
			}

			@ApiOperation(value = "扫码支付",tags = {"后台2.0-加盟商列表余额"})
			@@ -510,7 +510,7 @@
			// com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse prepay = nativePayService.prepay(prepayRequest);
			//预支付成功，创建预支付订单
			TFranchiseeBalanceChange tFranchiseeBalanceChange = new TFranchiseeBalanceChange();
			tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
			tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9962")).setScale(2,BigDecimal.ROUND_DOWN));
			tFranchiseeBalanceChange.setIs_pay(0);
			tFranchiseeBalanceChange.setFranchiseeName(byId.getName());
			tFranchiseeBalanceChange.setFranchiseeId(String.valueOf(byId.getId()));
			@@ -592,7 +592,7 @@
			// com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse prepay = nativePayService.prepay(prepayRequest);
			//预支付成功，创建预支付订单
			TFranchiseeBalanceChange tFranchiseeBalanceChange = new TFranchiseeBalanceChange();
			tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9972")).setScale(2,BigDecimal.ROUND_DOWN));
			tFranchiseeBalanceChange.setAmount(money.multiply(new BigDecimal("0.9962")).setScale(2,BigDecimal.ROUND_DOWN));
			tFranchiseeBalanceChange.setIs_pay(0);
			tFranchiseeBalanceChange.setFranchiseeName(byId.getName());
			tFranchiseeBalanceChange.setFranchiseeId(String.valueOf(byId.getId()));

	ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/WithdrawFallbackFactory.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -104,6 +104,11 @@
			public R<WithdrawDetailVO> withdrawDetailByUser(String orderId) {
			return R.fail(cause.getMessage());
			}

			@Override
			public R<String> confirmMoney(String id) {
			return null;
			}
			};
			}
			}