diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxWalletServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxWalletServiceImpl.java index 4916779..a434741 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxWalletServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxWalletServiceImpl.java @@ -279,6 +279,25 @@ public class NxWalletServiceImpl extends ServiceImpl 0) { + return "金额不能大于100000"; + } + if (form.getPriceStar().stripTrailingZeros().scale() > 0){ + return "金额必须为整数"; + } +// if (form.getPriceStar().remainder(BigDecimal.ONE).equals(BigDecimal.ZERO)){ +// +// }else { +// return "金额必须为整数"; +// } if(form.getRechargeStatus().equals("2")){ System.out.println(form.getPhoto().toString()); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java index b09d7aa..ab9cc88 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxWalletController.java @@ -432,7 +432,6 @@ public class NxWalletController { return ActionResult.fail("修改数据状态失败,该按钮需要商户管理员修改"); }else { entity.setOrderStatus(status); - nxWalletService.update(id, entity); final String POST_URL = this.appUrl + "/api/index/recharge-balance"; HttpPost httpPost = new HttpPost(POST_URL); @@ -453,16 +452,20 @@ public class NxWalletController { CloseableHttpResponse response = httpClient.execute(httpPost);) { HttpEntity responseEntity = response.getEntity(); String result = EntityUtils.toString(responseEntity); + log.info("request result: {}", result); // 输出接口返回的数据 -// System.out.println(result); -// response.close(); -// httpClient.close(); + JSONObject jsonObject1 = JSONObject.parseObject(result); + if (jsonObject1.getString("code").equals("200")) { + }else { + String errorMsg = jsonObject1.getString("msg"); + return ActionResult.fail(errorMsg); + } + nxWalletService.update(id, entity); + }catch (Exception e){ return ActionResult.fail("接口更改金额异常"); } -// CloseableHttpClient httpClient = HttpClients.createDefault(); -// CloseableHttpResponse response = httpClient.execute(httpPost); } } } diff --git a/jnpf-java-boot/jnpf-web/src/views/nxwallet/form.vue b/jnpf-java-boot/jnpf-web/src/views/nxwallet/form.vue index 309741b..2219544 100644 --- a/jnpf-java-boot/jnpf-web/src/views/nxwallet/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/nxwallet/form.vue @@ -112,10 +112,19 @@ + placeholder="数字文本" :min="500" :max="10000" :step="1"> + + + + + + + +