Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

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

@@ -9,6 +9,7 @@ import com.java110.acct.bmo.shopVipAccountDetail.IDeleteShopVipAccountDetailBMO;
 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.ShopUserAccountVipDto;
 import com.java110.dto.shopVipAccount.ShopVipAccountDto;
 import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import com.java110.po.shopVipAccount.ShopVipAccountPo;
@@ -202,23 +203,5 @@ public class ShopVipAccountApi {
     }
 
 
-    /**
-     * 微信删除消息模板
-     *
-     * @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,4 +1,5 @@
 package com.java110.acct.bmo.shopVipAccountDetail;
+import com.java110.dto.shopVipAccount.ShopUserAccountVipDto;
 import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
 import org.springframework.http.ResponseEntity;
 public interface IGetShopVipAccountDetailBMO {
@@ -13,4 +14,5 @@ public interface IGetShopVipAccountDetailBMO {
     ResponseEntity<String> get(ShopVipAccountDetailDto shopVipAccountDetailDto);
 
 
+
 }

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

@@ -1,8 +1,14 @@
 package com.java110.acct.bmo.shopVipAccountDetail.impl;
 
 import com.java110.acct.bmo.shopVipAccountDetail.IGetShopVipAccountDetailBMO;
+import com.java110.dto.shopVipAccount.ShopUserAccountVipDto;
 import com.java110.dto.shopVipAccount.ShopVipAccountDetailDto;
+import com.java110.dto.shopVipAccount.ShopVipAccountDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.acct.IShopVipAccountDetailInnerServiceSMO;
+import com.java110.intf.acct.IShopVipAccountInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.utils.util.Assert;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -18,6 +24,8 @@ public class GetShopVipAccountDetailBMOImpl implements IGetShopVipAccountDetailB
     @Autowired
     private IShopVipAccountDetailInnerServiceSMO shopVipAccountDetailInnerServiceSMOImpl;
 
+
+
     /**
      * @param shopVipAccountDetailDto
      * @return 订单服务能够接受的报文
@@ -41,4 +49,5 @@ public class GetShopVipAccountDetailBMOImpl implements IGetShopVipAccountDetailB
         return responseEntity;
     }
 
+
 }

service-report/src/main/java/com/java110/report/bmo/reportInfoBackCity/impl/SaveReportInfoBackCityBMOImpl.java

@@ -5,6 +5,7 @@ import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.report.IReportInfoBackCityInnerServiceSMO;
 import com.java110.po.reportInfoBackCity.ReportInfoBackCityPo;
 import com.java110.report.bmo.reportInfoBackCity.ISaveReportInfoBackCityBMO;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -25,6 +26,10 @@ public class SaveReportInfoBackCityBMOImpl implements ISaveReportInfoBackCityBMO
     @Java110Transactional
     public ResponseEntity<String> save(ReportInfoBackCityPo reportInfoBackCityPo) {
 
+        if(StringUtil.isEmpty(reportInfoBackCityPo.getUserId())){
+            reportInfoBackCityPo.setUserId("-1");
+        }
+
         reportInfoBackCityPo.setBackId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_backId));
         int flag = reportInfoBackCityInnerServiceSMOImpl.saveReportInfoBackCity(reportInfoBackCityPo);