优化代码

java110-bean/src/main/java/com/java110/dto/shopVipAccount/ShopUserAccountVipDto.java

@@ -0,0 +1,92 @@
+package com.java110.dto.shopVipAccount;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 用户账户信息 和vip信息
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class ShopUserAccountVipDto extends PageDto implements Serializable {
+
+
+    private String integral;
+    private String gold;
+    private String cash;
+    private String vipLevel;
+    private String shopId;
+    private String userId;
+    private String userName;
+    private String tel;
+
+
+    public String getIntegral() {
+        return integral;
+    }
+
+    public void setIntegral(String integral) {
+        this.integral = integral;
+    }
+
+    public String getGold() {
+        return gold;
+    }
+
+    public void setGold(String gold) {
+        this.gold = gold;
+    }
+
+    public String getCash() {
+        return cash;
+    }
+
+    public void setCash(String cash) {
+        this.cash = cash;
+    }
+
+    public String getVipLevel() {
+        return vipLevel;
+    }
+
+    public void setVipLevel(String vipLevel) {
+        this.vipLevel = vipLevel;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+}

java110-bean/src/main/java/com/java110/dto/shopVipAccountDetail/ShopVipAccountDetailDto.java

@@ -1,4 +1,4 @@
-package com.java110.dto.shopVipAccountDetail;
+package com.java110.dto.shopVipAccount;
 
 import com.java110.dto.PageDto;
 import java.io.Serializable;

java110-interface/src/main/java/com/java110/intf/acct/IShopVipAccountDetailInnerServiceSMO.java

@@ -1,8 +1,7 @@
 package com.java110.intf.acct;
 
 import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
-import com.java110.po.accountDetail.AccountDetailPo;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.po.shopVipAccountDetail.ShopVipAccountDetailPo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;

service-acct/src/main/java/com/java110/acct/api/ShopVipAccountApi.java

@@ -10,7 +10,7 @@ import com.java110.acct.bmo.shopVipAccountDetail.IGetShopVipAccountDetailBMO;
 import com.java110.acct.bmo.shopVipAccountDetail.ISaveShopVipAccountDetailBMO;
 import com.java110.acct.bmo.shopVipAccountDetail.IUpdateShopVipAccountDetailBMO;
 import com.java110.dto.shopVipAccount.ShopVipAccountDto;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.po.shopVipAccount.ShopVipAccountPo;
 import com.java110.po.shopVipAccountDetail.ShopVipAccountDetailPo;
 import com.java110.utils.util.Assert;
@@ -200,4 +200,25 @@ public class ShopVipAccountApi {
         shopVipAccountDetailDto.setShopId(shopId);
         return getShopVipAccountDetailBMOImpl.get(shopVipAccountDetailDto);
     }
+
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param shopId 小区ID
+     * @return
+     * @serviceCode /shopVipAccount/queryShopUserAccountAndVip
+     * @path /app/shopVipAccount/queryShopUserAccountAndVip
+     */
+    @RequestMapping(value = "/queryShopUserAccountAndVip", method = RequestMethod.GET)
+    public ResponseEntity<String> queryShopUserAccountAndVip(@RequestParam(value = "shopId") String shopId,
+                                                             @RequestParam(value = "userId") String userId,
+                                                            @RequestParam(value = "page") int page,
+                                                            @RequestParam(value = "row") int row) {
+        ShopVipAccountDetailDto shopVipAccountDetailDto = new ShopVipAccountDetailDto();
+        shopVipAccountDetailDto.setPage(page);
+        shopVipAccountDetailDto.setRow(row);
+        shopVipAccountDetailDto.setShopId(shopId);
+        return getShopVipAccountDetailBMOImpl.get(shopVipAccountDetailDto);
+    }
 }

service-acct/src/main/java/com/java110/acct/bmo/shopVipAccountDetail/IGetShopVipAccountDetailBMO.java

@@ -1,5 +1,5 @@
 package com.java110.acct.bmo.shopVipAccountDetail;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import org.springframework.http.ResponseEntity;
 public interface IGetShopVipAccountDetailBMO {
 

service-acct/src/main/java/com/java110/acct/bmo/shopVipAccountDetail/impl/GetShopVipAccountDetailBMOImpl.java

@@ -1,7 +1,7 @@
 package com.java110.acct.bmo.shopVipAccountDetail.impl;
 
 import com.java110.acct.bmo.shopVipAccountDetail.IGetShopVipAccountDetailBMO;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.intf.acct.IShopVipAccountDetailInnerServiceSMO;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;

service-acct/src/main/java/com/java110/acct/smo/impl/ShopVipAccountDetailInnerServiceSMOImpl.java

@@ -4,7 +4,7 @@ package com.java110.acct.smo.impl;
 import com.java110.acct.dao.IShopVipAccountDetailServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
-import com.java110.dto.shopVipAccountDetail.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.intf.acct.IShopVipAccountDetailInnerServiceSMO;
 import com.java110.po.shopVipAccountDetail.ShopVipAccountDetailPo;
 import com.java110.utils.util.BeanConvertUtil;