修改用户二维码生成

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

 package com.pangding.web.authority.controller;
 
 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.helper.CheckerHelper;
@@ -56,8 +57,11 @@ public class CompanyCodeController {
 
     @RequestMapping(value = "/saveCompanyCode")
     @ApiModelProperty(value = "保存商户二维码",notes = "返回保存二维码结果")
-    public ResponseResult saveCompanyCode(@RequestBody CompanyCodeReqVo req){
-
+    public ResponseResult<CompanyCodeVo> saveCompanyCode(@RequestBody CompanyCodeReqVo req){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId", req.getCompanyId())
+//                .notBlankCheck("codeLink", req.getCodeLink())
+                .checkException();
         return ResponseResult.resultAllowNull(companyCodeService.saveComapnyCode(req));
     }
 

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

 package com.pangding.web.authority.dao;
 
+import com.pangding.web.vo.system.req.company.CompanyCodeReqVo;
+import com.pangding.web.vo.system.res.company.CompanyCodeResVo;
 import com.yanzuoguang.dao.BaseDao;
 
+import java.util.List;
+
 public interface CompanyCodeDao extends BaseDao {
+
+    List<CompanyCodeResVo> findCodeList(CompanyCodeReqVo req);
+
+
 }

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

@@ -2,16 +2,33 @@ package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.CompanyCodeDao;
 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.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 public class CompanyCodeDaoImpl extends BaseDaoImpl implements CompanyCodeDao {
 
+    private final String FIND_CODE_LIST = "FIND_CODE_LIST";
+
 
     @Override
     protected void init() {
         register(CompanyCodeVo.class);
+
+        table.add(FIND_CODE_LIST, "select a.*,b.enum_value as enumName " +
+                "from pd_company_code a left join pd_enum b on a.code_type = b.enum_key " +
+                "where b.child_type = 'code_type'")
+                .add("companyId","AND company_id = ? ");
+
     }
 
+    public List<CompanyCodeResVo> findCodeList(CompanyCodeReqVo req){
+        return query(CompanyCodeResVo.class, FIND_CODE_LIST, req);
+    }
+
+
 }

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

 package com.pangding.web.authority.service;
 
+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;
 
@@ -25,6 +26,6 @@ public interface CompanyCodeService {
      * 保存公司二维码
      * @param req
      */
-    String saveComapnyCode(CompanyCodeReqVo req);
+    CompanyCodeVo saveComapnyCode(CompanyCodeReqVo req);
 
 }

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

@@ -31,12 +31,12 @@ public class CompanyCodeServiceImpl implements CompanyCodeService {
      */
     @Override
     public List<CompanyCodeResVo> findCodeList(CompanyCodeReqVo req){
-        List<CompanyCodeResVo> companyCodeResVoList = companyCodeDao.loadList(req, CompanyCodeResVo.class);
+        List<CompanyCodeResVo> companyCodeResVoList = companyCodeDao.findCodeList(req);
         return companyCodeResVoList;
     }
 
     @Override
-    public String saveComapnyCode(CompanyCodeReqVo req){
+    public CompanyCodeVo saveComapnyCode(CompanyCodeReqVo req){
         CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
         companyCodeReqVo.setCompanyId(req.getCompanyId());
         companyCodeReqVo.setCodeCode(req.getCodeCode());
@@ -47,8 +47,14 @@ public class CompanyCodeServiceImpl implements CompanyCodeService {
             ObjectHelper.writeWithFrom(companyCodeVo, req);
             companyCodeVo.setCompanyCodeId(StringHelper.getNewID());
             companyCodeDao.create(companyCodeVo);
+        }else{
+            String companyCodeId = companyCodeVo.getCompanyCodeId();
+            ObjectHelper.writeWithFrom(companyCodeVo, req);
+            req.setCompanyCodeId(companyCodeId);
+            companyCodeDao.update(companyCodeVo);
+
         }
-        return "";
+        return companyCodeVo;
     }
 
 }

src/main/resources/bootstrap-dev.yml

@@ -2,6 +2,7 @@ eureka:
   client:
     service-url:
       defaultZone: http://192.168.100.2:6800/eureka/
+#      defaultZone: http://10.150.2.2:6800/eureka/
 yzg:
   logAll: true
   PrintSql: true