From e5dcaef99cdd37cf8c231305e284e19cff64398f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 23 Dec 2018 00:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=B4=A6=E6=88=B7=E9=BB=98=E8=AE=A4=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/account.html             | 11 ++++------
 .../jsh/erp/controller/AccountController.java | 22 +++++++++++++++----
 .../erp/service/account/AccountService.java   | 12 ++++++++++
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html
index 9e913119..f3a00aec 100644
--- a/erp_web/pages/manage/account.html
+++ b/erp_web/pages/manage/account.html
@@ -321,24 +321,21 @@
             function setDefault(accountID, isDefault) {
                 $.ajax({
                     type: "post",
-                    url: "/account/updateAmountIsDefault.action",
+                    url: "/account/updateAmountIsDefault",
                     dataType: "json",
                     async: false,
                     data: ({
-                        AccountID: accountID,
-                        IsDefault: isDefault
+                        accountId: accountID,
+                        isDefault: isDefault
                     }),
                     success: function (res) {
                         if (res == "true" && isDefault) {
 
-                        }
-                        else {
-
                         }
                     },
                     //此处添加错误处理
                     error: function () {
-                        $.messager.alert('删除提示', '删除结算账户异常，请稍后再试！', 'error');
+                        $.messager.alert('提示', '设为默认账户异常，请稍后再试！', 'error');
                         return;
                     }
                 });
diff --git a/src/main/java/com/jsh/erp/controller/AccountController.java b/src/main/java/com/jsh/erp/controller/AccountController.java
index 247b90fd..aa44d79b 100644
--- a/src/main/java/com/jsh/erp/controller/AccountController.java
+++ b/src/main/java/com/jsh/erp/controller/AccountController.java
@@ -6,12 +6,10 @@ import com.jsh.erp.datasource.entities.Account;
 import com.jsh.erp.datasource.vo.AccountVo4InOutList;
 import com.jsh.erp.service.account.AccountService;
 import com.jsh.erp.utils.BaseResponseInfo;
+import com.jsh.erp.utils.ErpInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -19,6 +17,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
+
 @RestController
 @RequestMapping(value = "/account")
 public class AccountController {
@@ -121,4 +121,18 @@ public class AccountController {
         return res;
     }
 
+
+    @PostMapping(value = "/updateAmountIsDefault")
+    public String updateAmountIsDefault(@RequestParam("isDefault") Boolean isDefault,
+                                 @RequestParam("accountId") Long accountId,
+                                 HttpServletRequest request) {
+        Map<String, Object> objectMap = new HashMap<String, Object>();
+        int res = accountService.updateAmountIsDefault(isDefault, accountId);
+        if(res > 0) {
+            return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
+        } else {
+            return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
+        }
+    }
+
 }
diff --git a/src/main/java/com/jsh/erp/service/account/AccountService.java b/src/main/java/com/jsh/erp/service/account/AccountService.java
index 18b424f8..19c26324 100644
--- a/src/main/java/com/jsh/erp/service/account/AccountService.java
+++ b/src/main/java/com/jsh/erp/service/account/AccountService.java
@@ -75,6 +75,10 @@ public class AccountService {
 
     public int insertAccount(String beanJson, HttpServletRequest request) {
         Account account = JSONObject.parseObject(beanJson, Account.class);
+        if(account.getInitialamount() == null) {
+            account.setInitialamount(0d);
+        }
+        account.setIsdefault(false);
         return accountMapper.insertSelective(account);
     }
 
@@ -292,4 +296,12 @@ public class AccountService {
         return accountMapper.findAccountInOutListCount(accountId);
     }
 
+    public int updateAmountIsDefault(Boolean isDefault, Long accountId) {
+        Account account = new Account();
+        account.setIsdefault(isDefault);
+        AccountExample example = new AccountExample();
+        example.createCriteria().andIdEqualTo(accountId);
+        return accountMapper.updateByExampleSelective(account, example);
+    }
+
 }