充值 优化

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleOrderServiceImpl.java

@@ -594,9 +594,9 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
             response.setPrice(price);
             response.setOrderNums(root.size());
             //接单数
-            int takeOrder = (int) root.stream().filter(obj -> StringUtils.isNoneBlank(obj.getOrderClientStatusId()) &&
-                    !OrderStatusEnum.PENDING.getCode().equals(obj.getOrderClientStatusId()) &&
-                    !OrderStatusEnum.CANCELED.getCode().equals(obj.getOrderClientStatusId())).count();
+            int takeOrder = (int) root.stream().filter(obj -> StringUtils.isNoneBlank(obj.getOrderStatusId()) &&
+                    !OrderStatusEnum.PENDING.getCode().equals(obj.getOrderStatusId()) &&
+                    !OrderStatusEnum.CANCELED.getCode().equals(obj.getOrderStatusId())).count();
             double percentage = (double) takeOrder / root.size() * 100;
             String percentageString = String.format("%.1f", percentage) + "%";
             response.setOrderAcceptanceRate(percentageString);

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java

@@ -439,6 +439,7 @@ public class NxWalletController {
                                 JSONObject jsonObject = new JSONObject();
                                 jsonObject.put("merchantId", organizeEntityList.get(0).id);
                                 jsonObject.put("amount", entity.getPriceStar());
+                                jsonObject.put("orderNumber", entity.getOrderCode());
                                 String jsonData = jsonObject.toJSONString();
 //                                List<NameValuePair> nvps = new ArrayList<>();
 //                                nvps.add(new BasicNameValuePair("amount", String.valueOf(entity.getPriceStar())));