修改消息发送

pom.xml

@@ -43,6 +43,10 @@
             <groupId>com.pangding.web</groupId>
             <artifactId>pd-log-feign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.pangding.web</groupId>
+            <artifactId>pd-partner-ref</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

src/main/java/com/pangding/web/authority/controller/CompanyCodeController.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping(value = "/companyCode", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "商户二维码相关类", description = "商户二维码新增，修改，删除等相关操作")
@@ -44,14 +46,19 @@ public class CompanyCodeController {
 
     @RequestMapping(value = "/findCodeList")
     @ApiOperation(value = "查询商户二维码列表", notes = "返回商户二维码列表")
-    public ResponseResult findCodeList(@RequestBody CompanyCodeReqVo req) {
-        return null;
+    public ResponseResult<List<CompanyCodeResVo>> findCodeList(@RequestBody CompanyCodeReqVo req) {
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId", req.getCompanyId())
+//                .notBlankCheck("codeType", req.getCodeType())
+                .checkException();
+        return ResponseResult.result(companyCodeService.findCodeList(req));
     }
 
     @RequestMapping(value = "/saveCompanyCode")
     @ApiModelProperty(value = "保存商户二维码",notes = "返回保存二维码结果")
     public ResponseResult saveCompanyCode(@RequestBody CompanyCodeReqVo req){
-        return null;
+
+        return ResponseResult.result(companyCodeService.saveComapnyCode(req));
     }
 
 

src/main/java/com/pangding/web/authority/controller/CompanyController.java

@@ -69,7 +69,6 @@ public class CompanyController {
     public ResponseResult findCompanyById(@RequestBody CompanyReqVo req){
         CheckerHelper.newInstance().notBlankCheck("", req.getId()).checkException();
         return ResponseResult.result(companyService.findCompanyById(req));
-
     }
 
 }

src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java

@@ -2,15 +2,15 @@ package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.CompanyResVo;
+import com.pangding.web.authority.vo.resvo.CompanyLoginResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -79,7 +79,7 @@ public class CompanyManagementController {
      * @return 封装了用户，公司主表信息的对象
      */
     @RequestMapping(value = "/detail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<CompanyResVo> getDetail(@RequestBody CompanyGetReqVo reqVo){
+    public ResponseResult<CompanyLoginResVo> getDetail(@RequestBody CompanyGetReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("id",reqVo.getId())
                 .checkException();
@@ -240,7 +240,7 @@ public class CompanyManagementController {
      * @return
      */
     @RequestMapping(value = "/myInvite", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<CompanyVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
+    public ResponseResult<PageSizeData<CompanyResVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();

src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java

@@ -2,7 +2,7 @@ package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.vo.reqvo.*;
-import com.pangding.web.authority.vo.resvo.CompanyResVo;
+import com.pangding.web.authority.vo.resvo.CompanyLoginResVo;
 import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
 import com.pangding.web.authority.vo.resvo.GetCompanyResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
@@ -10,6 +10,7 @@ import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -39,7 +40,7 @@ public class PangdingManagementController {
      * @return 公司列表分页对象
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<CompanyVo>> list(@RequestBody ListCompanyReqVo reqVo){
+    public ResponseResult<PageSizeData<CompanyResVo>> list(@RequestBody ListCompanyReqVo reqVo){
         return ResponseResult.result(companyServiceImpl.list(reqVo));
     }
 
@@ -59,7 +60,7 @@ public class PangdingManagementController {
      * @return 封装了用户，公司，公司扩展表和银行卡列表信息的对象
      */
     @RequestMapping(value = "/pdDetail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<CompanyResVo> pdGetDetail(@RequestBody CompanyGetReqVo reqVo){
+    public ResponseResult<CompanyLoginResVo> pdGetDetail(@RequestBody CompanyGetReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getId())
                 .checkException();
@@ -274,7 +275,7 @@ public class PangdingManagementController {
      * @return
      */
     @RequestMapping(value = "/myInvite", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<CompanyVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
+    public ResponseResult<PageSizeData<CompanyResVo>> myInvite(@RequestBody ListCompanyReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .checkException();

src/main/java/com/pangding/web/authority/controller/UserController.java

@@ -6,13 +6,15 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.pangding.web.util.RSAUtils;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
+import com.pangding.web.vo.system.req.authority.UserReqVo;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping(value = "/user")
+@Api(value = "用户相关类", description = "用户新增，修改，删除等相关操作")
 public class UserController {
 
     @Autowired
@@ -91,10 +94,27 @@ public class UserController {
      * @return
      */
     @RequestMapping(value = "/list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<PageSizeData<WebUserResVo>> listUsers(ListUserReqVo reqVo){
+    public ResponseResult<PageSizeData<WebUserResVo>> listUsers(@RequestBody ListUserReqVo reqVo){
         return ResponseResult.result(userServiceImpl.getWebUserResVoList(reqVo));
     }
 
+    /**
+     * 查询公司用户列表(新)
+     * @return
+     */
+    @RequestMapping(value = "/userList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "查询用户列表", notes = "返回用户列表信息.")
+    public ResponseResult<PageSizeData<UserVo>> userList(@RequestBody ListUserReqVo reqVo){
+        return ResponseResult.result(userServiceImpl.getUserVoList(reqVo));
+    }
+
+    @RequestMapping(value = "/updateUserInfo", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ApiOperation(value = "只修改用户信息", notes = "返回修改结果.")
+    public ResponseResult updateUserInfo(@RequestBody UserReqVo req){
+        CheckerHelper.newInstance().notBlankCheck("id", req.getId()).checkException();
+        return ResponseResult.result(userServiceImpl.updateUserInfo(req));
+    }
+
     /**
      * 根据ID查询用户
      * @param //id

src/main/java/com/pangding/web/authority/dao/CompanyDao.java

@@ -2,6 +2,7 @@ package com.pangding.web.authority.dao;
 
 import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.dao.BaseDao;
 import com.yanzuoguang.util.vo.PageSizeData;
 
@@ -16,5 +17,5 @@ public interface CompanyDao extends BaseDao {
      * @param reqVo
      * @return
      */
-    PageSizeData<CompanyVo> getCompanyList(ListCompanyReqVo reqVo);
+    PageSizeData<CompanyResVo> getCompanyList(ListCompanyReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/dao/UserRoleDao.java

 package com.pangding.web.authority.dao;
 
 import com.pangding.web.authority.vo.reqvo.UserRoleGetReqVo;
-import com.pangding.web.authority.vo.UserRoleVo;
 import com.pangding.web.authority.vo.resvo.WebRoleResVo;
+import com.pangding.web.vo.system.pd.authority.UserRoleVo;
 import com.yanzuoguang.dao.BaseDao;
 
 import java.util.List;

src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java

@@ -3,6 +3,7 @@ package com.pangding.web.authority.dao.impl;
 import com.pangding.web.authority.dao.CompanyDao;
 import com.pangding.web.authority.vo.reqvo.ListCompanyReqVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.dao.DaoConst;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -22,7 +23,8 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
 
         register(CompanyVo.class);
 
-        table.add(SELECT,"select * from pd_company where 1=1 {WHERE} order by create_time desc")
+        table.add(SELECT,"select a.*,b.invitation_code,b.withdraw_money  from pd_company a inner join pd_company_extend b on a.id = b.id " +
+                "where 1=1 {WHERE} order by create_time desc")
                 .add("companyName","and company_name = ? ")
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")
@@ -34,7 +36,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
     }
 
     @Override
-    public PageSizeData<CompanyVo> getCompanyList(ListCompanyReqVo reqVo) {
-        return this.queryPage(CompanyVo.class,reqVo,SELECT,reqVo);
+    public PageSizeData<CompanyResVo> getCompanyList(ListCompanyReqVo reqVo) {
+        return this.queryPage(CompanyResVo.class,reqVo,SELECT,reqVo);
     }
 }

src/main/java/com/pangding/web/authority/dao/impl/UserDaoImpl.java

@@ -26,7 +26,8 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     protected void init() {
         register(UserVo.class);
 
-        table.add(SELECT,"select * from pd_user where 1=1");
+        table.add(SELECT,"select * from pd_user where 1=1")
+                .add("companyId","and company_id = ? ");
 
         table.addExist(CHECK_ACCOUNT,"account");
 

src/main/java/com/pangding/web/authority/dao/impl/UserRoleDaoImpl.java

@@ -2,8 +2,8 @@ package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.UserRoleDao;
 import com.pangding.web.authority.vo.reqvo.UserRoleGetReqVo;
-import com.pangding.web.authority.vo.UserRoleVo;
 import com.pangding.web.authority.vo.resvo.WebRoleResVo;
+import com.pangding.web.vo.system.pd.authority.UserRoleVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 

src/main/java/com/pangding/web/authority/feign/PayFeign.java

 package com.pangding.web.authority.feign;
 
-import com.pangding.web.authority.vo.reqvo.CompanyBankReqVo1;
 import com.pangding.web.authority.vo.reqvo.CompanyReqVo;
+import com.pangding.web.vo.system.req.DeviceReqVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
 import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.IOException;
 
@@ -54,4 +56,22 @@ public interface PayFeign {
      */
     @RequestMapping(value = "/sign")
     ResponseResult<CompanyReqVo> sign(@RequestBody CompanyReqVo req) throws IOException;
+
+    /**
+     * 绑定设备编号
+     * @param deviceReqVo
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/vspTermidService",  method = RequestMethod.POST)
+    ResponseResult<Boolean> vspTermidService(@RequestBody DeviceReqVo deviceReqVo);
+
+    /**
+     * 上传证件相片
+     * @param req
+     * @return
+     */
+    @RequestMapping(value = "/uploadPic", method = RequestMethod.POST)
+    ResponseResult<Boolean> idcardCollect(@RequestBody SaveCompanyReqVo req);
+
 }

src/main/java/com/pangding/web/authority/service/CompanyCodeService.java

@@ -3,6 +3,8 @@ package com.pangding.web.authority.service;
 import com.pangding.web.vo.system.req.company.CompanyCodeReqVo;
 import com.pangding.web.vo.system.res.company.CompanyCodeResVo;
 
+import java.util.List;
+
 public interface CompanyCodeService {
 
     /**
@@ -12,4 +14,17 @@ public interface CompanyCodeService {
      */
     CompanyCodeResVo findCodeLink(CompanyCodeReqVo req);
 
+    /**
+     * 找到公司二维码列表
+     * @param req
+     * @return
+     */
+    List<CompanyCodeResVo> findCodeList(CompanyCodeReqVo req);
+
+    /**
+     * 保存公司二维码
+     * @param req
+     */
+    String saveComapnyCode(CompanyCodeReqVo req);
+
 }

src/main/java/com/pangding/web/authority/service/CompanyService.java

@@ -5,10 +5,9 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
-import com.pangding.web.vo.system.req.CompanyMsgReqVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
-import com.pangding.web.vo.system.res.CompanyMsgResVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -38,14 +37,14 @@ public interface CompanyService{
      * @param reqVo 继承了分页对象
      * @return 公司列表分页对象
      */
-    PageSizeData<CompanyVo> list(ListCompanyReqVo reqVo);
+    PageSizeData<CompanyResVo> list(ListCompanyReqVo reqVo);
 
     /**
      * 胖丁查询用户，公司和公司扩展表信息以及银行卡列表
      * @param reqVo 包含公司id的请求对象
      * @return 封装了用户，公司，公司扩展表和银行卡列表信息的对象
      */
-    CompanyResVo pdGetDetail(CompanyGetReqVo reqVo);
+    CompanyLoginResVo pdGetDetail(CompanyGetReqVo reqVo);
 
     /**
      * 根据请求的数据返回对应的供应商或是接口商列表
@@ -59,7 +58,7 @@ public interface CompanyService{
      * @param reqVo 包含公司id的请求对象
      * @return 封装了用户，公司主表信息的对象
      */
-    CompanyResVo getDetail(CompanyGetReqVo reqVo);
+    CompanyLoginResVo getDetail(CompanyGetReqVo reqVo);
 
     /**
      * 新增/修改公司信息
@@ -158,7 +157,7 @@ public interface CompanyService{
      * @param reqVo 封装了公司id的请求对象
      * @return
      */
-    PageSizeData<CompanyVo> myInvite(ListCompanyReqVo reqVo);
+    PageSizeData<CompanyResVo> myInvite(ListCompanyReqVo reqVo);
 
     String invitation(InvitationReqVo reqVo);
 

src/main/java/com/pangding/web/authority/service/UserService.java

@@ -4,8 +4,10 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserRoleVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
+import com.pangding.web.vo.system.req.authority.UserReqVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 
@@ -30,6 +32,13 @@ public interface UserService {
      */
     String updateUser(WebUserReqVo userDto);
 
+    /**
+     * 保存更新后的用户信息，并更新用户和角色的对应关系
+     *
+     * @param user UserDto对象
+     */
+    String updateUserInfo(UserReqVo user);
+
     /**
      * 检查用户名是否存在
      *

src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java

@@ -9,10 +9,7 @@ import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityResVo;
 import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
-import com.pangding.web.vo.system.pd.authority.AuthorityVo;
-import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
-import com.pangding.web.vo.system.pd.authority.RoleVo;
-import com.pangding.web.vo.system.pd.authority.UserVo;
+import com.pangding.web.vo.system.pd.authority.*;
 import com.pangding.web.vo.system.res.authority.RoleAuthorityLoadResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;

src/main/java/com/pangding/web/authority/service/impl/CompanyCodeServiceImpl.java

@@ -2,11 +2,16 @@ package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.CompanyCodeDao;
 import com.pangding.web.authority.service.CompanyCodeService;
+import com.pangding.web.vo.system.pd.company.CompanyCodeVo;
 import com.pangding.web.vo.system.req.company.CompanyCodeReqVo;
 import com.pangding.web.vo.system.res.company.CompanyCodeResVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.helper.StringHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class CompanyCodeServiceImpl implements CompanyCodeService {
 
@@ -19,5 +24,23 @@ public class CompanyCodeServiceImpl implements CompanyCodeService {
         return companyCodeResVo;
     }
 
+    /**
+     * 找到公司的二维码列表
+     * @param req
+     * @return
+     */
+    @Override
+    public List<CompanyCodeResVo> findCodeList(CompanyCodeReqVo req){
+        List<CompanyCodeResVo> companyCodeResVoList = companyCodeDao.loadList(req, CompanyCodeResVo.class);
+        return companyCodeResVoList;
+    }
+
+    @Override
+    public String saveComapnyCode(CompanyCodeReqVo req){
+        CompanyCodeVo companyCodeVo = new CompanyCodeVo();
+        ObjectHelper.writeWithFrom(companyCodeVo, req);
+        companyCodeVo.setCompanyCodeId(StringHelper.getNewID());
+        return companyCodeDao.create(companyCodeVo);
+    }
 
 }

src/main/java/com/pangding/web/authority/service/impl/CompanyMsgServiceImpl.java

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.CompanyMsgDao;
+import com.pangding.web.authority.dao.UserDao;
 import com.pangding.web.authority.service.CompanyMsgService;
+import com.pangding.web.partner.mq.PartnerProcedure;
+import com.pangding.web.partner.vo.req.SoundContentVo;
 import com.pangding.web.vo.system.req.CompanyMsgReqVo;
+import com.pangding.web.vo.system.req.authority.UserReqVo;
 import com.pangding.web.vo.system.res.CompanyMsgResVo;
+import com.pangding.web.vo.system.res.authority.UserResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class CompanyMsgServiceImpl implements CompanyMsgService{
 
     @Autowired
     private CompanyMsgDao companyMsgDao;
+    @Autowired
+    private UserDao userDao;
+    @Autowired
+    private PartnerProcedure partnerProcedure;
 
 
     @Override
@@ -26,6 +37,19 @@ public class CompanyMsgServiceImpl implements CompanyMsgService{
 
         companyMsgDao.create(reqVo);
 
+        SoundContentVo soundContentVo = new SoundContentVo();
+        soundContentVo.setTipContent(reqVo.getMsgContent());
+        soundContentVo.setTipSound(reqVo.getMsgSound());
+        soundContentVo.setTipUrl("http://frapp.pangdly.com?msg=" + soundContentVo.getTipContent());
+
+        UserReqVo userReqVo = new UserReqVo();
+        userReqVo.setCompanyId(reqVo.getCompanyId());
+        List<UserResVo> userResList = userDao.loadList(userReqVo, UserResVo.class);
+        for(int i = 0; i < userResList.size(); i++){
+            if(1 == userResList.get(i).getReceiveFlag()){
+                partnerProcedure.sendSoundContent(userResList.get(i).getId(), soundContentVo);
+            }
+        }
         return ResponseResult.result("处理成功");
     }
 

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -4,15 +4,16 @@ import com.pangding.web.authority.dao.*;
 import com.pangding.web.authority.feign.PayFeign;
 import com.pangding.web.authority.feign.StoreFeign;
 import com.pangding.web.authority.feign.WxFeign;
+import com.pangding.web.authority.service.CompanyCodeService;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.authority.service.PangdingPartnerService;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.util.CompanyBankCardConstant;
-import com.pangding.web.authority.util.CompanyConstant;
 import com.pangding.web.authority.util.RsaConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
+import com.pangding.web.constant.CompanyConstant;
 import com.pangding.web.constant.OrderConstant;
 import com.pangding.web.mq.CompanyProducer;
 import com.pangding.web.util.RSAUtils;
@@ -20,27 +21,30 @@ import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.CompanyMsgVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserRoleVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.CompanyMsgReqVo;
+import com.pangding.web.vo.system.req.authority.UserRoleReqVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.req.company.CompanyCodeReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
-import com.pangding.web.vo.system.res.CompanyMsgResVo;
 import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
 import com.pangding.web.vo.system.res.company.CompanyMoneyDetailResVo;
+import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
-import com.yanzuoguang.util.helper.JsonHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -84,6 +88,12 @@ public class CompanyServiceImpl implements CompanyService {
     private CompanyMoneyDetailDao companyMoneyDetailDao;
     @Autowired
     private CompanyProducer companyProducer;
+    @Autowired
+    private CompanyCodeService companyCodeService;
+    @Value("${msg.payMsgId}")
+    private String payMsgId;
+    @Value("${msg.groupProductMsgId}")
+    private String groupProductMsgId;
 
     /**
      * 修改公司信息
@@ -104,8 +114,8 @@ public class CompanyServiceImpl implements CompanyService {
      * @return 公司列表分页对象
      */
     @Override
-    public PageSizeData<CompanyVo> list(ListCompanyReqVo reqVo) {
-        PageSizeData<CompanyVo> pageSizeData = companyDao.getCompanyList(reqVo);
+    public PageSizeData<CompanyResVo> list(ListCompanyReqVo reqVo) {
+        PageSizeData<CompanyResVo> pageSizeData = companyDao.getCompanyList(reqVo);
         if (null == pageSizeData || null == pageSizeData.getList() || pageSizeData.getList().isEmpty()) {
             throw new CodeException("暂无公司信息");
         }
@@ -119,8 +129,8 @@ public class CompanyServiceImpl implements CompanyService {
      * @return 封装了用户，公司，公司扩展表和银行卡列表信息的对象
      */
     @Override
-    public CompanyResVo pdGetDetail(CompanyGetReqVo reqVo) {
-        CompanyResVo resVo = getDetail(reqVo);
+    public CompanyLoginResVo pdGetDetail(CompanyGetReqVo reqVo) {
+        CompanyLoginResVo resVo = getDetail(reqVo);
         /*获取用户表信息*/
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setIsFirst(1);
@@ -147,8 +157,8 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
-    public CompanyResVo getDetail(CompanyGetReqVo reqVo) {
-        CompanyResVo resVo = new CompanyResVo();
+    public CompanyLoginResVo getDetail(CompanyGetReqVo reqVo) {
+        CompanyLoginResVo resVo = new CompanyLoginResVo();
         /*获取公司表信息*/
         CompanyVo companyVo = companyDao.load(reqVo, CompanyVo.class);
         if (null != companyVo) {
@@ -487,7 +497,7 @@ public class CompanyServiceImpl implements CompanyService {
     @Transactional(rollbackFor = Exception.class)
     public ResponseResult<CompanyBankCardVo> saveBank(CompanyBankCardReqVo reqVo) {
         CompanyVo companyVo = companyDao.load(reqVo.getCompanyId(), CompanyVo.class);
-        if(StringHelper.isEmpty(companyVo)){
+        if (StringHelper.isEmpty(companyVo)) {
             throw new CodeException("用户信息没有找到。");
         }
         // 判断银行卡是否存在
@@ -510,7 +520,7 @@ public class CompanyServiceImpl implements CompanyService {
             ObjectHelper.writeWithFrom(companyBankCardVo, resVo);
             companyBankCardVo.setIsDefault(0);
             companyBankCardDao.update(companyBankCardVo);
-            if(1 == companyBankCardVo.getStatus()){
+            if (1 == companyBankCardVo.getStatus()) {
                 return ResponseResult.error("99", "该银行卡已绑定");
             }
         } else {
@@ -538,7 +548,7 @@ public class CompanyServiceImpl implements CompanyService {
             }
             reqVo.setStatus(0);
             companyBankCardDao.create(companyBankCardVo);
-            if(1 == companyBankCardVo.getStatus()){
+            if (1 == companyBankCardVo.getStatus()) {
                 return ResponseResult.error("99", "该银行卡已绑定");
             }
         }
@@ -657,7 +667,7 @@ public class CompanyServiceImpl implements CompanyService {
             throw new CodeException("公司信息不存在");
         }
         ObjectHelper.writeWithFrom(companyExtendVo, companyResVo);
-        if(StringHelper.isEmpty(companyResVo.getQrCode())){
+        if (StringHelper.isEmpty(companyResVo.getQrCode())) {
             String code = DateHelper.getNow()
                     .replace("-", "")
                     .replace(":", "")
@@ -698,18 +708,39 @@ public class CompanyServiceImpl implements CompanyService {
         companyMsgReqVo.setCompanyId(companyResVo.getId());
         companyMsgReqVo.setMerchantId("");
         CompanyMsgVo companyMsgVo = companyMsgDao.load(companyMsgReqVo, CompanyMsgVo.class);
-        if(StringHelper.isEmpty(companyMsgVo)){
+        if (StringHelper.isEmpty(companyMsgVo)) {
             companyMsgVo = new CompanyMsgVo();
             companyMsgVo.setId(StringHelper.getNewID());
             companyMsgVo.setCompanyId(companyResVo.getId());
             companyMsgVo.setMerchantId(reqVo.getMerchantId());
             companyMsgVo.setCompanyName(companyResVo.getCompanyName());
             companyMsgVo.setMerchantName("");
-            companyMsgVo.setMsgId("4");
+            if (2 == reqVo.getCodeType()) {
+                companyMsgVo.setMsgId(groupProductMsgId);
+            } else {
+                companyMsgVo.setMsgId(payMsgId);
+            }
             companyMsgVo.setMsgLocation(1);
             companyMsgVo.setType(companyResVo.getCompanyAttribute());
             companyMsgDao.create(companyMsgVo);
         }
+        CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
+        companyCodeReqVo.setCompanyId(companyResVo.getId());
+        if (2 == reqVo.getCodeType()) {
+            companyCodeReqVo.setCodeType(4);
+            companyCodeReqVo.setCodeCode(companyResVo.getQrCode());
+        }
+        if (1 == reqVo.getCodeType()){
+            companyCodeReqVo.setCodeType(1);
+            companyCodeReqVo.setCodeCode(companyResVo.getQrCode());
+        }
+        companyCodeReqVo.setCodeLink("");
+        companyCodeReqVo.setCodeImgUrl(url);
+        companyCodeReqVo.setCodeValidityType(0);
+        companyCodeReqVo.setSubscribe(1);
+        companyCodeReqVo.setMsgGroupId("");
+        companyCodeReqVo.setCreateTime(DateHelper.getNow());
+        companyCodeService.saveComapnyCode(companyCodeReqVo);
         return url;
 
     }
@@ -841,7 +872,7 @@ public class CompanyServiceImpl implements CompanyService {
      * @return
      */
     @Override
-    public PageSizeData<CompanyVo> myInvite(ListCompanyReqVo reqVo) {
+    public PageSizeData<CompanyResVo> myInvite(ListCompanyReqVo reqVo) {
         return companyDao.getCompanyList(reqVo);
     }
 
@@ -919,16 +950,12 @@ public class CompanyServiceImpl implements CompanyService {
     @Transactional(rollbackFor = Exception.class)
     public void examineConfig(ExamineConfigReqVo reqVo) {
         /*更新公司表*/
-        CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
-        companyGetReqVo.setId(reqVo.getCompanyId());
-        CompanyVo companyVo = companyDao.load(companyGetReqVo, CompanyVo.class);
+        CompanyVo companyVo = companyDao.load(reqVo.getCompanyId(), CompanyVo.class);
         companyVo.setExamineStatus(reqVo.getExamineStatus());
         companyVo.setExamineFailedReason(reqVo.getExamineFailedReason());
         companyDao.update(companyVo);
         /*更新公司扩展表*/
-        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
-        companyExtendGetReqVo.setId(reqVo.getCompanyId());
-        CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
+        CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo.getCompanyId(), CompanyExtendVo.class);
         if (null == companyExtendVo) {
             companyExtendVo = new CompanyExtendVo();
             companyExtendVo.setId(reqVo.getCompanyId());
@@ -974,13 +1001,20 @@ public class CompanyServiceImpl implements CompanyService {
         roleVo.setIsAdmin(1);
         roleDao.update(roleVo);
         /*保存用户角色关系*/
-        UserRoleVo userRoleVo = new UserRoleVo();
+        UserRoleReqVo userRoleReqVo = new UserRoleReqVo();
+        userRoleReqVo.setUserId(reqVo.getUserId());
+        userRoleReqVo.setRoleId(reqVo.getRoleId());
+        UserRoleVo userRoleVo = userRoleDao.load(userRoleReqVo, UserRoleVo.class);
+        if (StringHelper.isEmpty(userRoleVo)) {
+            userRoleVo = new UserRoleVo();
             userRoleVo.setId(StringHelper.getNewID());
             userRoleVo.setUserId(reqVo.getUserId());
             userRoleVo.setRoleId(roleVo.getId());
             userRoleDao.create(userRoleVo);
         }
 
+    }
+
 
     @Override
     public ResponseResult<String> updateCompanyMoney(CompanyMoneyUpdateReqVo req) {
@@ -1105,26 +1139,26 @@ public class CompanyServiceImpl implements CompanyService {
             CompanyVo companyVo = new CompanyVo();
             ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
             ObjectHelper.writeWithFrom(companyVo, companyResVo);
-            if(StringHelper.isEmpty(req.getCompanyVo().getCompanyName())){
+            if (StringHelper.isEmpty(req.getCompanyVo().getCompanyName())) {
                 companyResVo.setCompanyName(req.getCompanyVo().getContactName());
             }
 //            companyDao.update(companyResVo);
 //            companyExtendDao.update(companyResVo);
         }
-        if(com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_PERSON == companyResVo.getCompanyType()){
+        if (com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_PERSON == companyResVo.getCompanyType()) {
             // 个人 TODO 调用通联实名制
             com.pangding.web.vo.system.req.company.SaveCompanyReqVo companyReqVo = new com.pangding.web.vo.system.req.company.SaveCompanyReqVo();
             companyReqVo.setCompanyVo(companyResVo);
             companyReqVo.setVerifyCode(req.getVerifyCode());
             responseResult = payFeign.setCompanyInfo1(companyReqVo);
         }
-        if(com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_COMPANY == companyResVo.getCompanyType() ){
+        if (com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_COMPANY == companyResVo.getCompanyType()) {
             // 公司
             // 找到银行卡 TODO 1判断银行卡id是否存在，存在则查询银行卡
             Date date = DateHelper.getDateTime(companyResVo.getCreateTime());
             String bankId = StringHelper.getNewIdMD5(date, req.getCompanyVo().getId(), req.getCompanyBankCardVo().getBankCardCode());
             CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(bankId, CompanyBankCardVo.class);
-            if(StringHelper.isEmpty(companyBankCardVo)){
+            if (StringHelper.isEmpty(companyBankCardVo)) {
                 companyBankCardVo = new CompanyBankCardVo();
                 ObjectHelper.writeWithFrom(companyBankCardVo, req.getCompanyBankCardVo());
                 companyBankCardVo.setId(bankId);
@@ -1135,7 +1169,7 @@ public class CompanyServiceImpl implements CompanyService {
                 companyBankCardVo.setStatus(0);
                 companyBankCardVo.setIsDefault(0);
                 companyBankCardDao.create(companyBankCardVo);
-            }else{
+            } else {
                 ObjectHelper.writeWithFrom(companyBankCardVo, req.getCompanyBankCardVo());
                 companyBankCardVo.setId(bankId);
                 companyBankCardDao.update(companyBankCardVo);
@@ -1148,7 +1182,7 @@ public class CompanyServiceImpl implements CompanyService {
             companyReqVo.setVerifyCode(req.getVerifyCode());
             responseResult = payFeign.setCompanyInfo1(companyReqVo);
             ObjectHelper.writeWithFrom(companyBankCardVo, responseResult.getData().getCompanyBankCardVo());
-            if(StringHelper.isEmpty(responseResult.getData().getErrorMessage())){
+            if (StringHelper.isEmpty(responseResult.getData().getErrorMessage())) {
                 companyBankCardVo.setStatus(1);
                 companyBankCardVo.setBindingTime(DateHelper.getNow());
                 companyBankCardVo.setBindingCode("");
@@ -1159,15 +1193,16 @@ public class CompanyServiceImpl implements CompanyService {
         ObjectHelper.writeWithFrom(companyResVo, saveCompanyReqVo.getCompanyVo());
         companyDao.update(companyResVo);
 
-        if(StringHelper.isEmpty(saveCompanyReqVo.getErrorMessage())){
+        if (StringHelper.isEmpty(saveCompanyReqVo.getErrorMessage())) {
             // 错误信息为空，发送验证码成功 修改信息成功
             return responseResult;
-        }else{
+        } else {
             return ResponseResult.error("99", saveCompanyReqVo.getErrorMessage());
         }
     }
 
-    public com.pangding.web.vo.system.res.company.CompanyResVo findCompanyById(com.pangding.web.vo.system.req.company.CompanyReqVo req){
+    @Override
+    public com.pangding.web.vo.system.res.company.CompanyResVo findCompanyById(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
         com.pangding.web.vo.system.res.company.CompanyResVo companyResVo = companyDao.load(req.getId(), com.pangding.web.vo.system.res.company.CompanyResVo.class);
         return companyResVo;
     }

src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java

@@ -2,10 +2,10 @@ package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
 import com.pangding.web.authority.service.DataService;
-import com.pangding.web.authority.util.CompanyConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.FindResVo;
+import com.pangding.web.constant.CompanyConstant;
 import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;

src/main/java/com/pangding/web/authority/service/impl/DeviceServiceImpl.java

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.DeviceDao;
+import com.pangding.web.authority.feign.PayFeign;
 import com.pangding.web.authority.service.DeviceService;
 import com.pangding.web.vo.system.pd.device.DeviceVo;
 import com.pangding.web.vo.system.req.DeviceReqVo;
@@ -18,6 +19,8 @@ public class DeviceServiceImpl implements DeviceService {
 
     @Autowired
     private DeviceDao deviceDao;
+    @Autowired
+    private PayFeign payFeign;
 
     @Override
     public ResponseResult<PageSizeData<DeviceResVo>> findDeviceList(DeviceReqVo req) {
@@ -43,6 +46,13 @@ public class DeviceServiceImpl implements DeviceService {
         ObjectHelper.writeWithFrom(deviceVo, req);
         deviceVo.setDeviceId(StringHelper.getNewID());
         deviceVo.setCreateTime(DateHelper.getNow());
+        ResponseResult<Boolean> responseResult = payFeign.vspTermidService(req);
+        boolean flag = responseResult.getData();
+        if(flag){
+            deviceVo.setDeviceStatus(0);
+        }else{
+            deviceVo.setDeviceStatus(4);
+        }
         deviceDao.create(deviceVo);
         return ResponseResult.result(deviceVo);
     }

src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java

@@ -10,6 +10,7 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
+import com.pangding.web.constant.CompanyConstant;
 import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.LoginTokenVo;
@@ -20,6 +21,7 @@ import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.LoginReqVo;
 import com.pangding.web.vo.system.res.company.CompanyResVo;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
@@ -190,7 +192,6 @@ public class RegisterServiceImpl implements RegisterService {
         companyVo.setExamineStatus(0);
         companyVo.setCompanyAttribute(reqVo.getCompanyAttribute());
         companyDaoImpl.update(companyVo);
-        System.out.println("companyAttribute:" + companyVo.getCompanyAttribute());
 
         /*跟新用户表添加联系方式*/
         UserVo userReqVo = new UserVo();
@@ -556,9 +557,7 @@ public class RegisterServiceImpl implements RegisterService {
      */
     @Override
     public String enterpriceSubmit(EnterpriceSubmitReqVo reqVo) {
-        CompanyGetReqVo getReqVo = new CompanyGetReqVo();
-        getReqVo.setId(reqVo.getId());
-        CompanyVo companyVo = companyDaoImpl.load(getReqVo, CompanyVo.class);
+        CompanyVo companyVo = companyDaoImpl.load(reqVo.getId(), CompanyVo.class);
         /*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
         CompanyReqVo companyReqVo = new CompanyReqVo();
         ObjectHelper.writeWithFrom(companyReqVo, companyVo);
@@ -616,6 +615,7 @@ public class RegisterServiceImpl implements RegisterService {
         companyBankCardVo.setIdCard(resCompanyReqVo.getContactCode());
         companyBankCardVo.setReservedPhone(resCompanyReqVo.getContactPhone());
         CompanyBankCardGetReqVo companyBankCardGetReqVo1 = new CompanyBankCardGetReqVo();
+        companyBankCardGetReqVo1.setCompanyId(companyBankCardVo.getCompanyId());
         companyBankCardGetReqVo1.setBankCardCode(bankList.get(0).getBankCardCode());
         CompanyBankCardVo companyBankCardVo2 = companyBankCardDaoImpl.load(companyBankCardGetReqVo1, CompanyBankCardVo.class);
         if (null == companyBankCardVo2) {
@@ -643,7 +643,36 @@ public class RegisterServiceImpl implements RegisterService {
         if (null == companyVo) {
             throw new CodeException("未查询到该公司信息，请稍后重试");
         }
+//        if(StringHelper.isEmpty(reqVo.getPicType())){
+//            reqVo.setPicType(com.pangding.web.constant.CompanyConstant.PIC_TYPE);
+//        }
+//        if(com.pangding.web.constant.CompanyConstant.PIC_TYPE == reqVo.getPicType()){
+//            companyVo.setUrl("http://picture.pangdly.com/" + reqVo.getUrl());
+//        }
+//        if(com.pangding.web.constant.CompanyConstant.USER_PHONE_FRONT == reqVo.getPicType()){
+//            companyVo.setUserPhoneFront("http://picture.pangdly.com/" + reqVo.getUrl());
+//        }
+//        if(com.pangding.web.constant.CompanyConstant.USER_PHONE_BACK == reqVo.getPicType()){
+//            companyVo.setUserPhoneBack("http://picture.pangdly.com/" + reqVo.getUrl());
+//        }
+//        if(com.pangding.web.constant.CompanyConstant.PIC_TYPE == reqVo.getPicType()){
             companyVo.setUrl(reqVo.getUrl());
+//        }
+//        if(com.pangding.web.constant.CompanyConstant.USER_PHONE_FRONT == reqVo.getPicType()){
+//            companyVo.setUserPhoneFront(reqVo.getUrl());
+//        }
+//        if(com.pangding.web.constant.CompanyConstant.USER_PHONE_BACK == reqVo.getPicType()){
+//            companyVo.setUserPhoneBack(reqVo.getUrl());
+//        }
+//        com.pangding.web.vo.system.req.company.SaveCompanyReqVo saveCompanyReqVo = new com.pangding.web.vo.system.req.company.SaveCompanyReqVo();
+//        saveCompanyReqVo.setCompanyVo(companyVo);
+//        saveCompanyReqVo.setPicType(reqVo.getPicType());
+//        ResponseResult<Boolean> responseResult = payFeign.idcardCollect(saveCompanyReqVo);
+//        if(responseResult.getData()){
             companyDaoImpl.update(companyVo);
+//        }else{
+//            throw new CodeException("图片上传失败");
+//        }
+
     }
 }

src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
-import com.pangding.web.authority.util.CompanyConstant;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.RoleService;
-import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.resvo.WebRoleResVo;
-import com.pangding.web.vo.system.pd.authority.AuthorityVo;
-import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
-import com.pangding.web.vo.system.pd.authority.RoleVo;
-import com.pangding.web.vo.system.pd.authority.UserVo;
+import com.pangding.web.constant.CompanyConstant;
+import com.pangding.web.vo.system.pd.authority.*;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

 package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.*;
-import com.pangding.web.authority.util.CompanyConstant;
 import com.pangding.web.authority.util.RsaConstant;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
-import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.pangding.web.constant.AuthorityConstant;
+import com.pangding.web.constant.CompanyConstant;
 import com.pangding.web.constant.PangdConstant;
 import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserRoleVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
@@ -19,10 +19,8 @@ import com.pangding.web.vo.system.req.authority.AuthorityReqVo;
 import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
 import com.pangding.web.vo.system.req.authority.UserReqVo;
 import com.pangding.web.vo.system.req.company.CompanyExtendReqVo;
-import com.pangding.web.vo.system.req.company.CompanyReqVo;
 import com.pangding.web.vo.system.res.authority.AuthorityResVo;
 import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
-import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
@@ -34,7 +32,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -162,6 +159,16 @@ public class UserServiceImpl implements UserService {
         return userVo.getId();
     }
 
+    @Override
+    public String updateUserInfo(UserReqVo req) {
+        UserVo userVo = userDao.load(req.getId(), UserVo.class);
+        if(!StringHelper.isEmpty(userVo)){
+            userVo.setReceiveFlag(req.getReceiveFlag());
+            userDao.update(userVo);
+        }
+        return userVo.getId();
+    }
+
     @Override
     public void checkAccount(UserVo userVo) {
         UserGetReqVo userGetReqVo = new UserGetReqVo();
@@ -288,23 +295,24 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public PageSizeData<WebUserResVo> getWebUserResVoList(ListUserReqVo reqVo) {
-        PageSizeData<UserVo> userVoPageSizeData = this.getUserVoList(reqVo);
         PageSizeData<WebUserResVo> webUserResVoPageSizeData = new PageSizeData();
+
+        // 找到用户列表
+        PageSizeData<UserVo> userVoPageSizeData = this.getUserVoList(reqVo);
+
         List<UserVo> userVoList = userVoPageSizeData.getList();
+        // 找到用户角色列表
         List<WebUserResVo> webUserResVoList = new ArrayList(userVoList.size());
         for (UserVo userVo : userVoList) {
             WebUserResVo resVo = new WebUserResVo();
             List<RoleVo> roleVoList = this.getRoleListByUserId(userVo.getId());
-
             ObjectHelper.writeWithFrom(resVo, userVo);
-
             webUserResVoList.add(resVo);
         }
         webUserResVoPageSizeData.setPageTotal(webUserResVoPageSizeData.getPageTotal());
         webUserResVoPageSizeData.setList(webUserResVoList);
         webUserResVoPageSizeData.setPageIndex(webUserResVoPageSizeData.getPageIndex());
         webUserResVoPageSizeData.setPageSize(webUserResVoPageSizeData.getPageSize());
-
         return webUserResVoPageSizeData;
     }
 

src/main/java/com/pangding/web/authority/util/CompanyConstant.java

-package com.pangding.web.authority.util;
-
-public class CompanyConstant {
-
-    /**
-     * 公司类型 个人
-     * 值：0
-     */
-    public static final int COMPANY_TYPE_PERSON = 0;
-
-    /**
-     * 公司类型 公司
-     * 值：1
-     */
-    public static final int COMPANY_TYPE_COMPANY = 1;
-
-    /**
-     * 供应商
-     * 值：0
-     */
-    public static final int PRODUCT = 0;
-
-    /**
-     * 接口商
-     * 值：1
-     */
-    public static final int INTERFACE = 1;
-
-    /**
-     * 公司状态 初始化
-     * 0
-     */
-    public static final int COMPANY_STATUS_INIT = 0;
-
-    /**
-     * 公司状态 创建会员
-     * 1
-     */
-    public static final int COMPANY_STATUS_CREATE_MEMBER = 1;
-
-    /**
-     * 公司状态 实名认证中
-     * 2
-     */
-    public static final int COMPANY_STATUS_REAL_NAMEING = 2;
-
-    /**
-     * 公司状态 实名认证成功
-     * 4
-     */
-    public static final int COMPANY_STATUS_REAL_NAME = 4;
-
-    /**
-     * 公司状态 实名认证失败
-     * 3
-     */
-    public static final int COMPANY_STATUS_REAL_NAME_ERROR = 3;
-
-    /**
-     * 公司状态 绑定手机中
-     * 5
-     */
-    public static final int COMPANY_STATUS_BIND_PHONEING = 5;
-
-    /**
-     * 公司状态 绑定手机成功
-     * 6
-     */
-    public static final int COMPANY_STATUS_BIND_PHONE = 6;
-
-    /**
-     * 公司状态 电子签约中
-     * 7
-     */
-    public static final int COMPANY_STATUS_SIGN_CONTRACTING = 7;
-
-    /**
-     * 公司状态 电子签约成功
-     * 9
-     */
-    public static final int COMPANY_STATUS_SIGN_CONTRACT = 9;
-
-    /**
-     * 公司状态 电子签约失败
-     * 8
-     */
-    public static final int COMPANY_STATUS_SIGN_CONTRACT_ERROR = 8;
-
-    /**
-     * 公司状态 设置支付密码中
-     * 10
-     */
-    public static final int COMPANY_STATUS_PAY_PWDING = 10;
-
-    /**
-     * 公司状态 支付密码设置成功
-     * 11
-     */
-    public static final int COMPANY_STATUS_PAY_PWD = 11;
-
-    /**
-     * 审核状态 未审核
-     * 0
-     */
-    public static final int COMPANY_STATUS_NO_EXAMINE = 0;
-
-    /**
-     * 审核状态 审核成功
-     * 1
-     */
-    public static final int COMPANY_STATUS_EXAMINE_SUCCESS = 1;
-
-    /**
-     * 审核状态 审核失败
-     * 2
-     */
-    public static final int COMPANY_STATUS_EXAMINE_ERROR = 2;
-
-    /**
-     * 审核状态 停用
-     * 3
-     */
-    public static final int COMPANY_STATUS_NO_USE = 3;
-
-    /**
-     * 公司性质 集团
-     * 1
-     */
-    public static final int COMPANY_NATURE_GROUP = 1;
-
-    /**
-     * 公司性质 公司
-     * 2
-     */
-    public static final int COMPANY_NATURE_COMPANY = 2;
-
-    /**
-     * 公司性质 个人
-     * 3
-     */
-    public static final int COMPANY_NATURE_PERSONAL = 3;
-
-    /**
-     * 公司性质 行政机构
-     * 4
-     */
-    public static final int COMPANY_NATURE_ADMINISTRATIVE_ORGAN = 4;
-
-    /**
-     * 公司签约状态 未签约
-     * 0
-     */
-    public static final int COMPANY_STATUS_SIGNING = 0;
-
-    /**
-     * 公司签约状态 签约成功
-     */
-    public static final int COMPANY_STATUS_SIGN_success = 1;
-
-    /**
-     * 胖丁公司id
-     */
-    public static final String PD_COMPANY_ID = "10001";
-
-    /**
-     * 0:分账、1:提现、2:充值、3:退款、4:平台转账给商户
-     */
-    public static final int MONEY_TYPE_FZ = 0;
-
-    public static final int MONEY_TYPE_TX = 1;
-
-    public static final int MONEY_TYPE_CZ = 2;
-
-    public static final int MONEY_TYPE_REFUND = 3;
-
-    public static final int MONEY_TYPE_ZZ = 4;
-
-    public static final int MONEY_TYPE_ORDER= 0;
-
-    public static final int MONEY_TYPE_DIVIDE = 1;
-
-
-
-}

src/main/java/com/pangding/web/authority/vo/UserRoleVo.java

-package com.pangding.web.authority.vo;
-
-import com.yanzuoguang.dao.TableAnnotation;
-import com.yanzuoguang.util.vo.BaseVo;
-
-import java.io.Serializable;
-
-/**
- * @author zhangjinyao
- */
-@TableAnnotation("pd_user_role")
-public class UserRoleVo extends BaseVo {
-
-    private String id;
-
-    @TableAnnotation("user_id")
-    private String userId;
-
-    @TableAnnotation("role_id")
-    private String roleId;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(String roleId) {
-        this.roleId = roleId;
-    }
-}

src/main/java/com/pangding/web/authority/vo/reqvo/BusinessLicenseCodeReqVo.java

@@ -11,6 +11,8 @@ public class BusinessLicenseCodeReqVo {
 
     private String url;
 
+    private Integer picType;
+
     public String getReqId() {
         return reqId;
     }
@@ -34,4 +36,12 @@ public class BusinessLicenseCodeReqVo {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public Integer getPicType() {
+        return picType;
+    }
+
+    public void setPicType(Integer picType) {
+        this.picType = picType;
+    }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/GenerateQrCodeUrlReqVo.java

@@ -14,6 +14,8 @@ public class GenerateQrCodeUrlReqVo {
     private String merchantId;
     @ApiModelProperty(notes = "商户名称")
     private String merchantName;
+    @ApiModelProperty(notes = "二维码类型，1支付码， 2 营销码")
+    public Integer codeType;
 
     private int select;
 
@@ -56,4 +58,12 @@ public class GenerateQrCodeUrlReqVo {
     public void setMerchantName(String merchantName) {
         this.merchantName = merchantName;
     }
+
+    public Integer getCodeType() {
+        return codeType;
+    }
+
+    public void setCodeType(Integer codeType) {
+        this.codeType = codeType;
+    }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/ListUserReqVo.java

@@ -9,6 +9,8 @@ import com.yanzuoguang.util.vo.PageSizeReqVo;
 public class ListUserReqVo extends PageSizeReqVo{
     private String reqId;
 
+    private String companyId;
+
     public String getReqId() {
         return reqId;
     }
@@ -16,4 +18,12 @@ public class ListUserReqVo extends PageSizeReqVo{
     public void setReqId(String reqId) {
         this.reqId = reqId;
     }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
 }

src/main/java/com/pangding/web/authority/vo/resvo/CompanyResVo.java → src/main/java/com/pangding/web/authority/vo/resvo/CompanyLoginResVo.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @Author zhangjinyao
  * @create 2019/5/23 14:53
  */
-public class CompanyResVo {
+public class CompanyLoginResVo {
     private UserVo userVo;
 
     private CompanyVo companyVo;

src/main/resources/bootstrap-dev.yml

@@ -5,3 +5,8 @@ eureka:
 yzg:
   logAll: true
   PrintSql: true
+
+
+msg:
+  payMsgId: 4
+  groupProductMsgId: 7
\ No newline at end of file