PLF 5 سال پیش
والد
کامیت
37dd3df3ed

+ 3 - 3
src/main/java/com/caimei/controller/user/PersonalController.java

@@ -116,17 +116,17 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public WxJsonModel saveAddress(@RequestBody Address address, String code, Integer userOrganizeID, HttpServletRequest request) {
+    public WxJsonModel saveAddress(@RequestBody Address address, String code, HttpServletRequest request) {
         WxJsonModel res = WxJsonModel.newInstance();
+        if (address == null) return res.error("参数异常");
         //判断是否处于登录状态
         WxJsonModel model = LoginController.login(code, request);
         if (model.getCode().equals("-1")) {
             return model;
         }
         String openid = (String) model.getData();
-        CmOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
+        CmOperationUser operationUser = loginService.doLogin(openid, address.getUserOrganizeID());
         if (operationUser == null) return res.error("账户异常");
-        if (address == null) return res.error("参数异常");
         try {
             personalService.saveAddress(address);
         } catch (Exception e) {

+ 9 - 0
src/main/java/com/caimei/entity/Address.java

@@ -15,6 +15,15 @@ public class Address implements Serializable {
     private String town;//村镇名
     private String city;//城市名称
     private String province;//省份名称
+    private Integer userOrganizeID;  //组织id
+
+    public Integer getUserOrganizeID() {
+        return userOrganizeID;
+    }
+
+    public void setUserOrganizeID(Integer userOrganizeID) {
+        this.userOrganizeID = userOrganizeID;
+    }
 
     public Integer getAddressID() {
         return addressID;

+ 2 - 1
src/main/java/com/caimei/service/user/impl/PersonalServiceImpl.java

@@ -42,9 +42,10 @@ public class PersonalServiceImpl implements PersonalService {
         Page<CmUserBalanceRecord> page = new Page<>(list);
         Double ableUserMoney = personalMapper.ableUserMoney(balanceRecord.getUserId());
         if (ableUserMoney == null) ableUserMoney = 0d;
+        String userMoney = String.format("%.2f", ableUserMoney);
         Map<String, Object> map = new HashMap();
         map.put("page", page);
-        map.put("ableUserMoney", ableUserMoney);
+        map.put("ableUserMoney", userMoney);
         return map;
     }