Merge branch 'feat-20221213-renlijiaservicecharge'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmPayOffServiceImpl.java

@@ -1235,8 +1235,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				// 服务费率
 				BigDecimal serviceCharge = sysDeptSub.getServiceCharge() == null ? BigDecimal.ZERO : sysDeptSub.getServiceCharge();
 				// 实际结算金额（结算金额*（1+服务费率））
-				BigDecimal actualAmount = note.getSettleAmount().multiply(serviceCharge.add(BigDecimal.ONE));
-				jsdMap.put("amount", actualAmount.setScale(2, RoundingMode.HALF_EVEN).toPlainString());
+				BigDecimal actualAmount = note.getSettleAmount().multiply(serviceCharge.add(BigDecimal.valueOf(100)))
+						.divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_EVEN);
+				jsdMap.put("amount", actualAmount.toPlainString());
 				jsdMap.put("mobile", sysUser.getPhone());
 				jsdMap.put("idCard", sysUser.getIdCardNumber());
 				jsdMap.put("name", sysUser.getRealname());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageSettleNoteServiceImpl.java

@@ -1913,8 +1913,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		// 服务费率
 		BigDecimal _serviceCharge = serviceCharge == null ? BigDecimal.ZERO : serviceCharge;
 		// 实际结算金额（结算金额*（1+服务费率））
-		BigDecimal actualAmount = note.getSettleAmount().multiply(_serviceCharge.add(BigDecimal.ONE));
-		jsdMap.put("amount", actualAmount.setScale(2, RoundingMode.HALF_EVEN).toPlainString());
+		BigDecimal actualAmount = note.getSettleAmount().multiply(_serviceCharge.add(BigDecimal.valueOf(100)))
+				.divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_EVEN);
+		jsdMap.put("amount", actualAmount.toPlainString());
 		jsdMap.put("mobile", sysUser.getPhone());
 		jsdMap.put("idCard", sysUser.getIdCardNumber());
 		jsdMap.put("name", sysUser.getRealname());