修改注册判断银行卡

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

@@ -7,6 +7,8 @@ import com.pangding.web.vo.system.res.company.CompanyResVo;
 import com.yanzuoguang.dao.BaseDao;
 import com.yanzuoguang.util.vo.PageSizeData;
 
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/13 14:24
@@ -20,6 +22,8 @@ public interface CompanyDao extends BaseDao {
      */
     PageSizeData<CompanyResVo> getCompanyList(ListCompanyReqVo reqVo);
 
+    List<CompanyResVo> findCompanyList(CompanyReqVo req);
+
     /**
      * 找到公司详情
      * @param req

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

@@ -10,6 +10,8 @@ import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/13 14:25
@@ -43,6 +45,8 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
                 .add("contactName","and contact_name LIKE concat('%', ?,'%') ")
                 .add("contactPhone","and contact_phone = ? ")
                 .add("status","and status = ? ")
+                .add("withdrawRule","and withdraw_rule = ? ")
+                .add("serviceChargeStatus","and service_charge_status = ? ")
                 .add("startDate","and create_time >= ? ")
                 .add("endDate","and create_time <= ? ");
 
@@ -72,6 +76,11 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
         return this.queryPage(CompanyResVo.class,reqVo,QUERY_COMPANY,reqVo);
     }
 
+    @Override
+    public List<CompanyResVo> findCompanyList(CompanyReqVo req) {
+        return this.query(CompanyResVo.class, QUERY_COMPANY, req);
+    }
+
     @Override
     public CompanyResVo findCompany(CompanyReqVo req) {
         return this.queryFirst(CompanyResVo.class, QUERY_COMPANY, req);

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

@@ -1369,25 +1369,27 @@ public class CompanyServiceImpl implements CompanyService {
         ObjectHelper.writeWithFrom(companyResVo, saveCompanyReqVo.getCompanyVo());
         companyDao.update(companyResVo);
 
-        /*保存或更新商户表*/
-        MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
-        ObjectHelper.writeWithFrom(merchantCreateReqVo, req.getMerchantVo());
-        merchantCreateReqVo.setAddress(req.getCompanyVo().getAddress());
-        merchantCreateReqVo.setType(req.getCompanyVo().getCompanyAttribute());
-        merchantCreateReqVo.setProductCompanyId(companyResVo.getId());
-        merchantCreateReqVo.setProductCompanyName(req.getCompanyVo().getCompanyName());
-        merchantCreateReqVo.setUserId(req.getUserVo().getId());
-        merchantCreateReqVo.setUsername(req.getUserVo().getAccount());
-        merchantCreateReqVo.setReqId(StringHelper.getNewID());
-        merchantCreateReqVo.setCreateTime(DateHelper.getNow());
-
-        if (!StringHelper.isEmpty(merchantCreateReqVo.getId())) {
-            merchantCreateReqVo.setId(StringHelper.getNewID());
-        }
-        ResponseResult<MerchantVo> merchantResponseResult = storeFeign.merchantCreate(merchantCreateReqVo);
-        if (merchantResponseResult.getCode().equals("00")) {
-            MerchantVo merchantVo = merchantResponseResult.getData();
-            saveCompanyReqVo.setMerchantVo(merchantVo);
+        if(PangdConstant.ATTRIBUTE_TAXI != companyResVo.getCompanyAttribute()){
+            /*保存或更新商户表*/
+            MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
+            ObjectHelper.writeWithFrom(merchantCreateReqVo, req.getMerchantVo());
+            merchantCreateReqVo.setAddress(req.getCompanyVo().getAddress());
+            merchantCreateReqVo.setType(req.getCompanyVo().getCompanyAttribute());
+            merchantCreateReqVo.setProductCompanyId(companyResVo.getId());
+            merchantCreateReqVo.setProductCompanyName(req.getCompanyVo().getCompanyName());
+            merchantCreateReqVo.setUserId(req.getUserVo().getId());
+            merchantCreateReqVo.setUsername(req.getUserVo().getAccount());
+            merchantCreateReqVo.setReqId(StringHelper.getNewID());
+            merchantCreateReqVo.setCreateTime(DateHelper.getNow());
+
+            if (!StringHelper.isEmpty(merchantCreateReqVo.getId())) {
+                merchantCreateReqVo.setId(StringHelper.getNewID());
+            }
+            ResponseResult<MerchantVo> merchantResponseResult = storeFeign.merchantCreate(merchantCreateReqVo);
+            if (merchantResponseResult.getCode().equals("00")) {
+                MerchantVo merchantVo = merchantResponseResult.getData();
+                saveCompanyReqVo.setMerchantVo(merchantVo);
+            }
         }
         if (StringHelper.isEmpty(saveCompanyReqVo.getErrorMessage())) {
             // 错误信息为空，发送验证码成功 修改信息成功

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

@@ -200,8 +200,6 @@ public class FinanceServiceImpl implements FinanceService {
         }
         // 提现手续费
         double withdrawFee = getWithdrawFee(companyResVo);
-        // 服务费
-        double serviceCharge = getServiceCharge(companyResVo);
         // 滞纳金
         double lateFee = StringHelper.isEmpty(companyResVo.getLateFee()) ? 0 : companyResVo.getLateFee();
 

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

@@ -46,7 +46,7 @@ public class UserTask {
         companyReqVo.setWithdrawRule(0);
         companyReqVo.setExamineStatus(1);
         companyReqVo.setStatus(6);
-        List<CompanyResVo> companyResVoList = companyDao.loadList(companyReqVo, CompanyResVo.class);
+        List<CompanyResVo> companyResVoList = companyDao.findCompanyList(companyReqVo);
         for (int i = 0; i < companyResVoList.size(); i++) {
             CompanyResVo companyResVo = companyResVoList.get(i);
             CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
@@ -76,13 +76,13 @@ public class UserTask {
     /**
      * 服务费
      */
-//    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 40 18 * * ?")
     public void serviceCharge() {
         CompanyReqVo companyReqVo = new CompanyReqVo();
         companyReqVo.setServiceChargeStatus(1);
         companyReqVo.setExamineStatus(1);
         companyReqVo.setStatus(6);
-        List<CompanyResVo> companyResVoList = companyDao.loadList(companyReqVo, CompanyResVo.class);
+        List<CompanyResVo> companyResVoList = companyDao.findCompanyList(companyReqVo);
         for (int i = 0; i < companyResVoList.size(); i++) {
             CompanyResVo companyResVo = companyResVoList.get(i);
             double serviceCharge = financeService.getServiceCharge(companyResVo);