修改名词异常

src/main/java/com/caimei/controller/user/PersonalController.java

@@ -36,8 +36,8 @@ public class PersonalController {
     @ResponseBody
     public CmWxJsonModel myCentre(CmMallOperationUser operationUser) {
         CmWxJsonModel res = CmWxJsonModel.newInstance();
-        CmMallClub cmMallClub = personalService.myCentre(operationUser);
-        return res.success("1", cmMallClub);
+        CmMallClub club = personalService.myCentre(operationUser);
+        return res.success("1", club);
     }
 
     /**
@@ -104,8 +104,8 @@ public class PersonalController {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<CmMallAddress> cmMallAddressList = personalService.findAddress(userID);
-        CmMallPage<CmMallAddress> page = new CmMallPage<>(cmMallAddressList);
+        List<CmMallAddress> addressList = personalService.findAddress(userID);
+        CmMallPage<CmMallAddress> page = new CmMallPage<>(addressList);
         return page;
     }
 
@@ -116,15 +116,15 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public CmWxJsonModel saveAddress(@RequestBody CmMallAddress cmMallAddress, String code, HttpServletRequest request) {
+    public CmWxJsonModel saveAddress(@RequestBody CmMallAddress address, String code, HttpServletRequest request) {
         CmWxJsonModel res = CmWxJsonModel.newInstance();
-        if (cmMallAddress == null) return res.error("参数异常");
+        if (address == null) return res.error("参数异常");
         //判断是否处于登录状态
         String openid = (String) request.getSession().getAttribute("openid");
-        CmMallOperationUser operationUser = loginService.doLogin(openid, cmMallAddress.getUserOrganizeID());
+        CmMallOperationUser operationUser = loginService.doLogin(openid, address.getUserOrganizeID());
         if (operationUser == null) return res.error("账户异常");
         try {
-            personalService.saveAddress(cmMallAddress);
+            personalService.saveAddress(address);
         } catch (Exception e) {
             return res.error("保存失败");
         }
@@ -155,9 +155,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/invoice")
-    public CmWxJsonModel invoice(@RequestBody CmMallUserInvoiceInfo cmMallUserInvoiceInfo) {
-        if (cmMallUserInvoiceInfo == null) return CmWxJsonModel.newInstance().error("参数异常");
-        CmWxJsonModel jsonModel = personalService.invoice(cmMallUserInvoiceInfo);
+    public CmWxJsonModel invoice(@RequestBody CmMallUserInvoiceInfo userInvoiceInfo) {
+        if (userInvoiceInfo == null) return CmWxJsonModel.newInstance().error("参数异常");
+        CmWxJsonModel jsonModel = personalService.invoice(userInvoiceInfo);
         return jsonModel;
     }
 }

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -142,7 +142,7 @@ public class OrderServiceImpl implements OrderService {
         //可用余额
         Double userMoney = personalMapper.ableUserMoney(userId);
         if (userMoney == null) userMoney = 0d;
-        map.put("cmMallShopList", cmMallShopList);
+        map.put("shopList", cmMallShopList);
         map.put("invoice", invoice);
         map.put("freight", freight);
         map.put("cellPhone", cellPhone);
@@ -277,7 +277,7 @@ public class OrderServiceImpl implements OrderService {
         map.put("order", order);
         map.put("userInfo", userInfo);
         map.put("shopOrderList", shopOrderList);
-        map.put("cmMallOrderInvoice", cmMallOrderInvoice);
+        map.put("orderInvoice", cmMallOrderInvoice);
         map.put("discernReceiptList", discernReceiptList);
         map.put("returnedPurchaseList", returnedPurchaseList);
         map.put("cellPhone", cellPhone);