Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OrderPayOpsServiceImpl.java

@@ -342,7 +342,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                         .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP);
                 
             	StudentPaymentOrder st = (StudentPaymentOrder) clazz;
-            	BigDecimal amount = amountTo.apply(st.getActualAmount());
+            	BigDecimal amount = amountTo.apply(st.getActualAmount()).setScale(2, RoundingMode.HALF_UP);
 		        
 				List<Map<String, Object>> divMemberList = new ArrayList<>();
                 // 实时分账
@@ -375,7 +375,11 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 				Map<String, Object> divMember1 = new HashMap<>();
 				divMember1.put("member_id", st.getMerNos());
 				divMember1.put("amount", payParam.getAmount().subtract(amount));
-				divMember1.put("fee_flag", "N");
+				if (divMemberList.size() > 0) {
+					divMember1.put("fee_flag", "N");
+				} else {
+					divMember1.put("fee_flag", "Y");
+				}
 				divMemberList.add(divMember1);
 				
 				paymentParams.put("div_members", JsonUtil.toJSONString(divMemberList));