新增设备，修改注册流程

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

@@ -239,6 +239,11 @@ public class CompanyManagementController {
         return ResponseResult.result(companyServiceImpl.myInvite(reqVo));
     }
 
+    /**
+     * 获取商户的邀请码
+     * @param reqVo
+     * @return
+     */
     @PostMapping(value = "invitation",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<String> invitation(@RequestBody InvitationReqVo reqVo){
         CheckerHelper.newInstance()

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

+package com.pangding.web.authority.controller;
+
+import com.pangding.web.authority.service.DeviceService;
+import com.pangding.web.vo.system.req.DeviceReqVo;
+import com.pangding.web.vo.system.res.DeviceResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+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.RestController;
+
+/**
+ * @author tangfang
+ * @date 2020-08-19
+ */
+@Api()
+@RestController
+@RequestMapping("/device")
+public class DevideController {
+
+    @Autowired
+    private DeviceService deviceService;
+
+    @RequestMapping(value = "/findDeviceList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<PageSizeData<DeviceResVo>> findDeviceList(@RequestBody DeviceReqVo req){
+//        CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
+        return deviceService.findDeviceList(req);
+    }
+
+
+    @RequestMapping(value = "/findDeviceInfo", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult<DeviceResVo> findDeviceInfo(@RequestBody DeviceReqVo req){
+//        CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
+        return deviceService.findDeviceInfo(req);
+    }
+
+    @RequestMapping(value = "/saveDevice", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult saveDevice(@RequestBody DeviceReqVo req){
+//        CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
+        return deviceService.saveDevice(req);
+    }
+
+    @RequestMapping(value = "/updateDevice", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult updateDevice(@RequestBody DeviceReqVo req){
+//        CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
+        return deviceService.updateDevice(req);
+    }
+
+    @RequestMapping(value = "/delDevice", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult delDevice(@RequestBody DeviceReqVo req){
+//        CheckerHelper.newInstance().notBlankCheck("id",req.getId()).checkException();
+        return deviceService.delDevice(req);
+    }
+
+}

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

+package com.pangding.web.authority.dao;
+
+import com.pangding.web.vo.system.req.DeviceReqVo;
+import com.pangding.web.vo.system.res.DeviceResVo;
+import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
+
+public interface DeviceDao extends BaseDao {
+
+    PageSizeData<DeviceResVo> findDevicePage(DeviceReqVo req);
+
+
+}

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

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.DeviceDao;
+import com.pangding.web.vo.system.pd.device.DeviceVo;
+import com.pangding.web.vo.system.req.DeviceReqVo;
+import com.pangding.web.vo.system.res.DeviceResVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author tangfang
+ * @date 2020-08-19
+ */
+@Component
+public class DeviceDaoImpl extends BaseDaoImpl implements DeviceDao {
+
+    private static final String QUERY_LIST = "QUERY_LIST";
+
+    @Override
+    protected void init() {
+        register(DeviceVo.class);
+
+        table.add(QUERY_LIST, "SELECT * FROM pd_device WHERE 1=1 {WHERE}")
+                .add("deviceId", " AND device_id = ? ")
+                .add("deviceName", " AND device_name = ? ")
+                .add("deviceType", " AND device_type = ? ")
+                .add("companyId", " AND company_id = ? ")
+                .add("channelId", " AND channel_id = ? ")
+                .add("merchantId", " AND merchant_id = ? ")
+                .add("deviceStatus", " AND device_status = ? ");
+
+    }
+
+    @Override
+    public PageSizeData<DeviceResVo> findDevicePage(DeviceReqVo req) {
+        return queryPage(DeviceResVo.class, req, QUERY_LIST, req);
+    }
+
+}

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

+package com.pangding.web.authority.service;
+
+import com.pangding.web.vo.system.pd.device.DeviceVo;
+import com.pangding.web.vo.system.req.DeviceReqVo;
+import com.pangding.web.vo.system.res.DeviceResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+
+public interface DeviceService {
+
+    ResponseResult<PageSizeData<DeviceResVo>> findDeviceList(DeviceReqVo req);
+
+    ResponseResult<DeviceResVo> findDeviceInfo( DeviceReqVo req);
+
+    ResponseResult saveDevice(DeviceReqVo req);
+
+    ResponseResult<DeviceVo> updateDevice(DeviceReqVo req);
+
+    ResponseResult delDevice(DeviceReqVo req);
+
+}

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

@@ -35,6 +35,7 @@ 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;
@@ -1077,7 +1078,7 @@ public class CompanyServiceImpl implements CompanyService {
             // 公司信息为空
             return ResponseResult.error("99", "注册信息有误");
         }
-        ObjectHelper.writeWithFrom(companyResVo, req);
+        ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
         companyResVo.setAddress(req.getCompanyVo().getAddress());
         companyResVo.setUpdateTime(DateHelper.getNow());
         if (com.pangding.web.constant.CompanyConstant.COMPANY_STATUS_BIND_PHONE < companyResVo.getStatus()) {
@@ -1085,7 +1086,7 @@ public class CompanyServiceImpl implements CompanyService {
 //            companyExtendDao.update(companyResVo);
         } else {
             CompanyVo companyVo = new CompanyVo();
-            ObjectHelper.writeWithFrom(companyResVo, req);
+            ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
             ObjectHelper.writeWithFrom(companyVo, companyResVo);
 //            companyDao.update(companyResVo);
 //            companyExtendDao.update(companyResVo);
@@ -1094,6 +1095,7 @@ public class CompanyServiceImpl implements CompanyService {
             // 个人 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() ){
@@ -1103,29 +1105,35 @@ public class CompanyServiceImpl implements CompanyService {
             String bankId = StringHelper.getNewIdMD5(date, req.getCompanyVo().getId(), req.getCompanyBankCardVo().getBankCardCode());
             CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(bankId, CompanyBankCardVo.class);
             if(StringHelper.isEmpty(companyBankCardVo)){
-               companyBankCardVo = new CompanyBankCardVo();
-               ObjectHelper.writeWithFrom(companyBankCardVo, req);
+                companyBankCardVo = new CompanyBankCardVo();
+               ObjectHelper.writeWithFrom(companyBankCardVo, req.getCompanyBankCardVo());
                companyBankCardVo.setId(bankId);
                companyBankCardVo.setName(req.getCompanyVo().getContactName());
                companyBankCardVo.setIdCard(req.getCompanyVo().getContactCode());
+               companyBankCardVo.setCompanyId(req.getCompanyVo().getId());
                companyBankCardVo.setType(1);
                companyBankCardVo.setStatus(0);
                companyBankCardVo.setIsDefault(0);
                companyBankCardDao.create(companyBankCardVo);
             }else{
-                ObjectHelper.writeWithFrom(companyBankCardVo, req);
+                ObjectHelper.writeWithFrom(companyBankCardVo, req.getCompanyBankCardVo());
                 companyBankCardVo.setId(bankId);
                 companyBankCardDao.update(companyBankCardVo);
             }
             // Todo 调用通联设置公司信息
             com.pangding.web.vo.system.req.company.SaveCompanyReqVo companyReqVo = new com.pangding.web.vo.system.req.company.SaveCompanyReqVo();
             companyReqVo.setCompanyVo(companyResVo);
+
             companyReqVo.setCompanyBankCardVo(companyBankCardVo);
             companyReqVo.setVerifyCode(req.getVerifyCode());
+            System.out.println("=======companyReqVo======" + JsonHelper.serialize(companyReqVo));
             responseResult = payFeign.setCompanyInfo1(companyReqVo);
+            System.out.println("=======responseResult======" + JsonHelper.serialize(responseResult));
             ObjectHelper.writeWithFrom(companyBankCardVo, responseResult.getData().getCompanyBankCardVo());
             if(StringHelper.isEmpty(responseResult.getData().getErrorMessage())){
                 companyBankCardVo.setStatus(1);
+                companyBankCardVo.setBindingTime(DateHelper.getNow());
+                companyBankCardVo.setBindingCode("");
             }
             companyBankCardDao.update(companyBankCardVo);
         }

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.service.DeviceService;
+import com.pangding.web.vo.system.pd.device.DeviceVo;
+import com.pangding.web.vo.system.req.DeviceReqVo;
+import com.pangding.web.vo.system.res.DeviceResVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+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.stereotype.Service;
+
+@Service
+public class DeviceServiceImpl implements DeviceService {
+
+    @Autowired
+    private DeviceDao deviceDao;
+
+    @Override
+    public ResponseResult<PageSizeData<DeviceResVo>> findDeviceList(DeviceReqVo req) {
+        PageSizeData<DeviceResVo> deviceResVoPageSizeData = deviceDao.findDevicePage(req);
+        return ResponseResult.result(deviceResVoPageSizeData);
+    }
+
+    @Override
+    public ResponseResult<DeviceResVo> findDeviceInfo(DeviceReqVo req) {
+        DeviceResVo deviceResVo = deviceDao.load(req.getDeviceId(), DeviceResVo.class);
+        return ResponseResult.result(deviceResVo);
+    }
+
+    @Override
+    public ResponseResult saveDevice(DeviceReqVo req) {
+        return ResponseResult.result(null);
+    }
+
+    @Override
+    public ResponseResult<DeviceVo> updateDevice(DeviceReqVo req) {
+        DeviceVo deviceVo = deviceDao.load(req.getDeviceId(), DeviceVo.class);
+        if(StringHelper.isEmpty(deviceVo)){
+            return ResponseResult.error("99", "设备编号有误");
+        }
+        ObjectHelper.writeWithFrom(deviceVo, req);
+        deviceDao.update(deviceVo);
+        return ResponseResult.result(deviceVo);
+    }
+
+    @Override
+    public ResponseResult delDevice(DeviceReqVo req) {
+        deviceDao.remove(req);
+        return ResponseResult.result(null);
+    }
+}

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

@@ -400,9 +400,23 @@ public class RegisterServiceImpl implements RegisterService {
             throw new CodeException("用户信息有误，请联系管理员");
         }
         // 找到登录用户公司信息
-        CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
-        companyGetReqVo.setId(userVo.getCompanyId());
-        CompanyVo companyVo = companyDaoImpl.load(companyGetReqVo, CompanyVo.class);
+        CompanyVo companyVo = companyDaoImpl.load(userVo.getCompanyId(), CompanyVo.class);
+        if (StringHelper.isEmpty(companyVo)) {
+            throw new CodeException("注册信息有误");
+        }
+        LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo();
+        loginCompanyResVo.setCompanyVo(companyVo);
+        reqVo.setToken(token);
+
+        // 找到公司银行信息
+        CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
+        getReqVo.setCompanyId(companyVo.getId());
+        List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo, CompanyBankCardVo.class);
+        getReqVo.setIsDefault(0);
+        CompanyBankCardVo companyBankCardVo = companyBankCardDaoImpl.load(getReqVo, CompanyBankCardVo.class);
+        loginCompanyResVo.setCompanyBankCardVo(companyBankCardVo);
+        resVo.setCompanyResVo(loginCompanyResVo);
+
         // 判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面
         if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && CompanyConstant.COMPANY_TYPE_PERSON == (companyVo.getCompanyType())) {
             resVo.setCode("01");
@@ -432,15 +446,9 @@ public class RegisterServiceImpl implements RegisterService {
             resVo.setUrl(companyReqVo1.getSignUrl());
             return resVo;
         }*/
-        LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo();
-        loginCompanyResVo.setCompanyVo(companyVo);
-        resVo.setCompanyResVo(loginCompanyResVo);
-        reqVo.setToken(token);
 
-        // 找到公司银行信息
-        CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
-        getReqVo.setCompanyId(companyVo.getId());
-        List<CompanyBankCardVo> companyBankCardVoList = companyBankCardDaoImpl.loadList(getReqVo, CompanyBankCardVo.class);
+
+
         if (companyBankCardVoList == null || companyBankCardVoList.isEmpty()) {
             /*该公司没有银行卡，需要跳转添加银行卡*/
             resVo.setCode("03");

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

 package com.pangding.web.authority.vo.reqvo;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * @Author zhangjinyao
  * @create 2019/6/4 16:52
@@ -8,20 +10,24 @@ public class SaveCompanyReqVo {
 
     private String reqId;
 
+    @ApiModelProperty(notes = "公司id")
     private String id;
     /**
      * 用户名
      */
+    @ApiModelProperty(notes = "用户名")
     private String account;
 
     /**
      * 用户类型
      */
+    @ApiModelProperty(notes = "用户类型")
     private int companyType;
 
     /**
      * 行业属性
      */
+    @ApiModelProperty(notes = "行业属性 1 景点 2 酒店，3餐饮，4特产")
     private int companyAttribute;
 
     /**
@@ -37,51 +43,61 @@ public class SaveCompanyReqVo {
     /**
      * 企业名称
      */
+    @ApiModelProperty(notes = "公司名称，营业执照名称")
     private String companyName;
 
     /**
      * 企业地址
      */
+    @ApiModelProperty(notes = "营业执照地址")
     private String companyAddress;
 
     /**
      * 营业执照号
      */
+    @ApiModelProperty(notes = "营业执照号")
     private String businessLicenseCode;
 
     /**
      * 法人姓名
      */
+    @ApiModelProperty(notes = "法人姓名")
     private String contactName;
 
     /**
      * 身份证号
      */
+    @ApiModelProperty(notes = "法人身份证")
     private String contactCode;
 
     /**
      * 电话
      */
+    @ApiModelProperty(notes = "法人电话")
     private String contactPhone;
 
     /**
      * 开户银行
      */
+    @ApiModelProperty(notes = "银行简称")
     private String bankName;
 
     /**
      * 开户地址
      */
+    @ApiModelProperty(notes = "开户行名称:如某某支行")
     private String bankAddress;
 
     /**
      * 开户账号
      */
+    @ApiModelProperty(notes = "银行卡号")
     private String bankCardCode;
 
     /**
      * 开户行号
      */
+    @ApiModelProperty(notes = "银行行号")
     private String bankCode;
 
     /**
@@ -105,6 +121,7 @@ public class SaveCompanyReqVo {
 
     private String userId;
 
+    @ApiModelProperty(notes = "验证码")
     private String verifyCode;
 
     private Integer status;

src/main/java/com/pangding/web/authority/vo/resvo/LoginCompanyResVo.java

@@ -12,6 +12,8 @@ import java.util.List;
 public class LoginCompanyResVo {
     private CompanyVo companyVo;
 
+    private CompanyBankCardVo companyBankCardVo;
+
     private List<CompanyBankCardVo> bankCardVoList;
 
     public CompanyVo getCompanyVo() {
@@ -22,6 +24,14 @@ public class LoginCompanyResVo {
         this.companyVo = companyVo;
     }
 
+    public CompanyBankCardVo getCompanyBankCardVo() {
+        return companyBankCardVo;
+    }
+
+    public void setCompanyBankCardVo(CompanyBankCardVo companyBankCardVo) {
+        this.companyBankCardVo = companyBankCardVo;
+    }
+
     public List<CompanyBankCardVo> getBankCardVoList() {
         return bankCardVoList;
     }