更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/PayOrderSettingService.java

@@ -100,6 +100,13 @@ public class PayOrderSettingService extends SuperService {
                 payOrderSettings.add(payOrderSetting);
                 newList.add(payOrderSetting);
             }
+            Collections.sort(newList, new Comparator<PayOrderSetting>() {
+
+                @Override
+                public int compare(PayOrderSetting o1, PayOrderSetting o2) {
+                    return (int) (o1.getSort() - o2.getSort());
+                }
+            });
             payOrderSettingDao.saveAll(newList);
         }
         return newList;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectMainPaySettingService.java

@@ -104,14 +104,14 @@ public class ProjectMainPaySettingService extends SuperService {
             return ResultContent.buildFail("项目分成和机构分成之和不等100");
         }
 
-        Long minWithdraw = param.getMinWithdraw();
-        Long maxWithdraw = param.getMaxWithdraw();
-        if (minWithdraw <= 0 || maxWithdraw <= 0) {
-            return ResultContent.buildFail("minWithdraw或maxWithdraw不能小于等于0");
-        }
-        if (minWithdraw > maxWithdraw) {
-            return ResultContent.buildFail("minWithdraw不能大于maxWithdraw");
-        }
+//        Long minWithdraw = param.getMinWithdraw();
+//        Long maxWithdraw = param.getMaxWithdraw();
+//        if (minWithdraw <= 0 || maxWithdraw <= 0) {
+//            return ResultContent.buildFail("minWithdraw或maxWithdraw不能小于等于0");
+//        }
+//        if (minWithdraw > maxWithdraw) {
+//            return ResultContent.buildFail("minWithdraw不能大于maxWithdraw");
+//        }
 
         ProjectMainPaySetting mainPaySetting = projectMainPaySettingDao.findTopByProjectOidAndChannelType(param.getProjectOid(), orgPaySettingInfo.getChannelType());
         if (ObjectUtils.isEmpty(mainPaySetting)) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -220,6 +220,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         expenseFlow.setPaymentNo(paymentNo);
         // 消费金额
         BigDecimal amount = CommonUtil.turnMoney2BigDecimal(iotParam.getAmount());
+        amount = amount.stripTrailingZeros();
         expenseFlow.setPayAmount(amount);
 
         String deviceId = iotParam.getDeviceId();
@@ -265,6 +266,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             entity.setVerifyError(String.format("设备未绑定机构"));
             return;
         }
+        // 设备所属的商户/机构
         entity.setShopOid(deviceInfo.getBeLongOid());
         // 设备区域
         entity.setArea(areaService.toSimpleModel(deviceInfo.getArea()));

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -131,7 +131,7 @@ public class PayCallService extends SuperService {
         }
 
         // 所有的渠道都支付失败
-        if (!b) {
+        if (!b && paymentTypes.size() == 1) {
             String msg = "支付失败";
             entity.setPaymentStatus("支付失败");
             entity.setIsPaySuccess(Boolean.FALSE);
@@ -251,7 +251,9 @@ public class PayCallService extends SuperService {
         paymentProcess.setIsPaying(Boolean.TRUE); // 支付中
 
         entity.setPayStartTime(System.currentTimeMillis());
-        com.github.microservice.net.ResultContent resultContent = chinaumsSenselessPayService.senselessPay(entity.getProjectOid(), entity.getShopOid(), entity.getUserId(), entity.getPayAmount(), entity.getPaymentNo(), entity.getRemark());
+        BigDecimal payAmount = entity.getPayAmount();
+        payAmount = payAmount.stripTrailingZeros();
+        com.github.microservice.net.ResultContent resultContent = chinaumsSenselessPayService.senselessPay(entity.getProjectOid(), entity.getShopOid(), entity.getUserId(), payAmount, entity.getPaymentNo(), entity.getRemark());
         if (resultContent.getState() == com.github.microservice.net.ResultState.Success) {
             // 关联参数
             String msg = "支付中";
@@ -290,6 +292,7 @@ public class PayCallService extends SuperService {
             paymentProcess.setIsPaySuccess(Boolean.FALSE);
             paymentProcess.setPayRemark(msg);
             paymentProcess.setIsPaying(Boolean.FALSE);
+            log.info("支付失败： {}", msg);
         }
         // 保存日志
         operationLogsService.addLog(logsAddParam);