修改码模板

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

@@ -44,7 +44,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("companyAttribute"," and company_attribute = ? ")
                 .add("examineStatus"," and examine_status = ?")
                 .add("companyId"," and invitation_company_id = ? ")
-                .add("invitationCode"," and (invitation_code = or chlid_invitation_code) ")
+                .add("invitationCode"," and (invitation_code = ? or child_invitation_code = ?) ")
                 .add("contactName"," and contact_name LIKE concat('%', ?,'%') ")
                 .add("contactPhone"," and contact_phone = ? ")
                 .add("status"," and status = ? ")

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

@@ -23,7 +23,7 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao
 
         register(CompanyMoneyVo.class);
 
-        table.add(QUERY_LIST, "SELECT * FROM pd_company_money WHERE 1=1 {WHERE}")
+        table.add(QUERY_LIST, "SELECT * FROM pd_company_money WHERE 1=1 {WHERE} order by daily_date desc")
                 .add("companyId", " AND company_id = ? ")
                 .add("startDate", " AND daily_date >= ?")
                 .add("endDate", " AND daily_date <= ?")

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

@@ -1408,16 +1408,16 @@ public class CompanyServiceImpl implements CompanyService {
         companyDao.update(companyResVo);
 
         // 保存行业商户信息 todo
-        List<MerchantRegVo> merchantRegVoList = req.getMerchantRegVoList();
-        List<CompanyMerchantVo> companyMerchantVoList = new ArrayList<>();
-        for(MerchantRegVo merchantRegVo : merchantRegVoList){
-            CompanyMerchantVo companyMerchantVo = new CompanyMerchantVo();
-            companyMerchantVo.setCompanyMerchantId(StringHelper.getNewID());
-            companyMerchantVo.setCompanyId(req.getCompanyVo().getId());
-            companyMerchantVo.setMerchantType(merchantRegVo.getMerchantType());
-            companyMerchantVo.setTitleName(merchantRegVo.getTitleName());
-            companyMerchantVoList.add(companyMerchantVo);
-        }
+//        List<MerchantRegVo> merchantRegVoList = req.getMerchantRegVoList();
+//        List<CompanyMerchantVo> companyMerchantVoList = new ArrayList<>();
+//        for(MerchantRegVo merchantRegVo : merchantRegVoList){
+//            CompanyMerchantVo companyMerchantVo = new CompanyMerchantVo();
+//            companyMerchantVo.setCompanyMerchantId(StringHelper.getNewID());
+//            companyMerchantVo.setCompanyId(req.getCompanyVo().getId());
+//            companyMerchantVo.setMerchantType(merchantRegVo.getMerchantType());
+//            companyMerchantVo.setTitleName(merchantRegVo.getTitleName());
+//            companyMerchantVoList.add(companyMerchantVo);
+//        }
 
         if (PangdConstant.ATTRIBUTE_TAXI != companyResVo.getCompanyAttribute()) {
             /*保存或更新商户表*/