修改注册判断银行卡

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

@@ -15,10 +15,9 @@ import com.yanzuoguang.util.vo.ResponseResult;
 import io.swagger.annotations.ApiOperation;
 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;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/newCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -82,5 +81,12 @@ public class CompanyController {
         return companyService.synCompanyInfo(req);
     }
 
+    @RequestMapping(value = "findInvitationReward")
+    @ApiOperation(value = "找到公司邀请奖励信息", notes = "找到公司邀请奖励信息")
+    public ResponseResult<CompanyResVo> findInvitationReward(@RequestBody CompanyReqVo req){
+        CheckerHelper.newInstance().notBlankCheck("id", req.getId()).checkException();
+        return ResponseResult.result(companyService.findCompanyInvitationReward(req));
+    }
+
 
 }

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

@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.reqvo.*;
 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.CompanyCodeVo;
 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;
@@ -105,10 +106,10 @@ public class CompanyManagementController {
      * @return 二维码url
      */
     @RequestMapping(value = "/generateQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
+    public ResponseResult<CompanyCodeVo> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
-//                .notBlankCheck("merchantId", reqVo.getMerchantId())
+                .notBlankCheck("codeType", reqVo.getCodeType())
                 .notBlankCheck("select",reqVo.getSelect())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.generateQrCodeUrl(reqVo));

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

@@ -7,6 +7,7 @@ import com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo;
 import com.pangding.web.authority.vo.resvo.GetCompanyResVo;
 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.CompanyCodeVo;
 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.CompanyReqVo;
@@ -142,9 +143,10 @@ public class PangdingManagementController {
      * @return 二维码url
      */
     @RequestMapping(value = "/generateQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
+    public ResponseResult<CompanyCodeVo> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
+                .notBlankCheck("codeType",reqVo.getCodeType())
                 .notBlankCheck("select",reqVo.getSelect())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.generateQrCodeUrl(reqVo));

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

@@ -4,6 +4,7 @@ import com.pangding.web.authority.service.PangdingPartnerService;
 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.CompanyCodeVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -165,7 +166,7 @@ public class PangdingPartnerController {
      * @return
      */
     @PostMapping(value = "/qrCodeUrl",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<String> qrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
+    public ResponseResult<CompanyCodeVo> qrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
                 .notBlankCheck("select",reqVo.getSelect())

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

@@ -24,17 +24,19 @@ public class CapitalFlowDaoImpl extends BaseDaoImpl implements CapitalFlowDao {
                 .add("startDate", " AND time >= ? ")
                 .add("endDate", " AND time <= ? ")
                 .add("orderId", " AND order_id = ? ")
-                .add("category", " AND category = ?")
+                .add("category", " AND category = ? ")
+                .add("categoryList", " AND category in (?) ")
                 .add("status"," AND status = ? ");
 
         table.add(QUERY_LIST_TOTAL, "SELECT count(id) as num,sum(order_money) as order_money,sum(order_fee) as order_fee," +
                 "sum(actual_money) as actual_money FROM pd_capital_flow  where  1=1 {WHERE} order by time desc")
-                .add("companyId","AND company_id = ? ")
-                .add("companyName","AND company_name LIKE concat(?,'%')")
-                .add("startDate", "AND time >= ? ")
-                .add("endDate", "AND time <= ? ")
-                .add("orderId", "AND order_id = ? ")
-                .add("category", "AND category = ?")
+                .add("companyId"," AND company_id = ? ")
+                .add("companyName"," AND company_name LIKE concat(?,'%')")
+                .add("startDate", " AND time >= ? ")
+                .add("endDate", " AND time <= ? ")
+                .add("orderId", " AND order_id = ? ")
+                .add("category", " AND category = ?")
+                .add("categoryList", " AND category in (?) ")
                 .add("status"," AND status = ? ");
     }
 

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

@@ -4,6 +4,7 @@ package com.pangding.web.authority.service;
 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.CompanyCodeVo;
 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.CompanyReqVo;
@@ -131,7 +132,7 @@ public interface CompanyService{
      * @param reqVo 封装了公司id，页面选项的请求对象
      * @return 二维码url
      */
-    String generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo);
+    CompanyCodeVo generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo);
 
     /**
      * 获取银行卡列表
@@ -230,4 +231,6 @@ public interface CompanyService{
      */
     void companyReward(CompanyResVo companyResVo);
 
+    CompanyResVo findCompanyInvitationReward(CompanyReqVo req);
+
 }

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

@@ -3,6 +3,7 @@ package com.pangding.web.authority.service;
 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.CompanyCodeVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.yanzuoguang.util.vo.ResponseResult;
 
@@ -81,7 +82,7 @@ public interface PangdingPartnerService {
      * @param reqVo 封装了公司id和选项（限制为永久）的请求对象
      * @return
      */
-    String qrCodeUrl(GenerateQrCodeUrlReqVo reqVo);
+    CompanyCodeVo qrCodeUrl(GenerateQrCodeUrlReqVo reqVo);
 
     /**
      * 根据公司id获取该公司的邀请码，若没有则创建

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

@@ -36,6 +36,7 @@ import com.pangding.web.vo.system.res.company.*;
 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;
@@ -102,6 +103,8 @@ public class CompanyServiceImpl implements CompanyService {
     private String groupProductMsgId;
     @Value("${pay.paydJumpUrl}")
     private String paydJumpUrl;
+    @Value("${pay.miniPayUrl}")
+    private String miniPayUrl;
 
 
     /**
@@ -241,6 +244,7 @@ public class CompanyServiceImpl implements CompanyService {
         if (!StringHelper.isEmpty(companyVo)) {
             resVo.setCompanyVo(companyVo);
 
+            if(PangdConstant.ATTRIBUTE_TAXI == companyVo.getCompanyAttribute()){
                 /*此处需要根据公司id和productOrInterface获取商户信息*/
                 CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
                 companyScenicInfoReqVo.setCompanyId(companyVo.getId());
@@ -254,6 +258,7 @@ public class CompanyServiceImpl implements CompanyService {
                 } catch (Exception e) {
                     resVo.setMerchant(null);
                 }
+            }
 
             /*获取公司扩展表信息*/
             CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo.getId(), CompanyExtendVo.class);
@@ -299,7 +304,10 @@ public class CompanyServiceImpl implements CompanyService {
             // 获取支付成功后跳转链接
             resVo.setPaydJumpUrl(getJumpUrl(companyVo));
 
+            // 查询公司用户信息和角色信息
+
         }
+        System.out.println("===========" + JsonHelper.serialize(resVo));
         return resVo;
     }
 
@@ -785,12 +793,12 @@ public class CompanyServiceImpl implements CompanyService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
+    public CompanyCodeVo generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
         com.pangding.web.vo.system.res.company.CompanyResVo companyResVo = companyDao.load(reqVo.getCompanyId(), com.pangding.web.vo.system.res.company.CompanyResVo.class);
         if (StringHelper.isEmpty(companyResVo)) {
             throw new CodeException("公司不存在");
         }
-        int codeType = 0;
+        int codeType = reqVo.getCodeType();
         String msgGroupId = payMsgId;
         if (2 == reqVo.getCodeType()) {
             codeType = 4;
@@ -808,23 +816,30 @@ public class CompanyServiceImpl implements CompanyService {
         companyCodeReqVo.setCodeType(reqVo.getCodeType());
         CompanyCodeVo companyCodeVo = companyCodeDao.load(companyCodeReqVo, CompanyCodeVo.class);
         if (StringHelper.isEmpty(companyCodeVo)) {
-            String code = DateHelper.getNow()
-                    .replace("-", "")
-                    .replace(":", "")
-                    .replace(" ", "");
             companyCodeVo = new CompanyCodeVo();
             companyCodeVo.setCompanyCodeId(StringHelper.getNewID());
             companyCodeVo.setCompanyId(reqVo.getCompanyId());
             companyCodeVo.setCodeType(reqVo.getCodeType());
-            companyCodeVo.setCodeCode(code);
             companyCodeVo.setCreateTime(DateHelper.getNow());
             companyCodeVo.setMsgGroupId(msgGroupId);
             companyCodeVo.setCodeStatus(0);
+            if(5 == codeType){
+                companyCodeVo.setCodeLink(miniPayUrl.replace("COMPANYID", companyResVo.getId()));
+            }else{
+                String code = DateHelper.getNow()
+                        .replace("-", "")
+                        .replace(":", "")
+                        .replace(" ", "");
+                companyCodeVo.setCodeCode(code);
                 // 获取微信二维码
                 companyCodeVo = getWeixinCode(0, companyCodeVo);
+            }
             companyCodeDao.create(companyCodeVo);
         }
         if (StringHelper.isEmpty(companyCodeVo.getCodeCode())) {
+            if(5 == codeType){
+                companyCodeVo.setCodeLink(miniPayUrl.replace("COMPANYID", companyResVo.getId()));
+            }else{
                 String code = DateHelper.getNow()
                         .replace("-", "")
                         .replace(":", "")
@@ -833,14 +848,16 @@ public class CompanyServiceImpl implements CompanyService {
                 companyCodeVo.setMsgGroupId(msgGroupId);
                 // 获取微信二维码
                 companyCodeVo = getWeixinCode(0, companyCodeVo);
+            }
             companyCodeDao.update(companyCodeVo);
         }
-        if (StringHelper.isEmpty(companyCodeVo.getCodeImgUrl())) {
+        if (StringHelper.isEmpty(companyCodeVo.getCodeImgUrl()) && 5!= codeType) {
             // 获取微信二维码
             companyCodeVo = getWeixinCode(0, companyCodeVo);
             companyCodeVo.setMsgGroupId(msgGroupId);
             companyCodeDao.update(companyCodeVo);
         }
+        if(5 != codeType){
             com.pangding.web.vo.system.req.CompanyMsgReqVo companyMsgReqVo = new com.pangding.web.vo.system.req.CompanyMsgReqVo();
             companyMsgReqVo.setCompanyId(companyCodeVo.getCompanyId());
             companyMsgReqVo.setMsgId(msgGroupId);
@@ -858,7 +875,8 @@ public class CompanyServiceImpl implements CompanyService {
                 companyMsgVo.setType(companyResVo.getCompanyAttribute());
                 companyMsgDao.create(companyMsgVo);
             }
-        return companyCodeVo.getCodeImgUrl();
+        }
+        return companyCodeVo;
     }
 
     public CompanyCodeVo getWeixinCode(int select, CompanyCodeVo companyCodeVo) {
@@ -1318,7 +1336,10 @@ public class CompanyServiceImpl implements CompanyService {
             ObjectHelper.writeWithFrom(companyResVo, req.getCompanyVo());
             ObjectHelper.writeWithFrom(companyVo, companyResVo);
             if (StringHelper.isEmpty(req.getCompanyVo().getCompanyName())) {
-                companyResVo.setCompanyName(req.getCompanyVo().getContactName());
+                companyResVo.setCompanyName(req.getMerchantVo().getName());
+                if(PangdConstant.ATTRIBUTE_TAXI == companyVo.getCompanyAttribute()){
+                    companyResVo.setCompanyName(req.getMerchantVo().getName() + companyVo.getContactName());
+                }
             }
         }
         if (com.pangding.web.constant.CompanyConstant.COMPANY_TYPE_PERSON == companyResVo.getCompanyType()) {
@@ -1369,7 +1390,7 @@ public class CompanyServiceImpl implements CompanyService {
         ObjectHelper.writeWithFrom(companyResVo, saveCompanyReqVo.getCompanyVo());
         companyDao.update(companyResVo);
 
-        if(PangdConstant.ATTRIBUTE_TAXI != companyResVo.getCompanyAttribute()){
+        if (PangdConstant.ATTRIBUTE_TAXI != companyResVo.getCompanyAttribute()) {
             /*保存或更新商户表*/
             MerchantCreateReqVo merchantCreateReqVo = new MerchantCreateReqVo();
             ObjectHelper.writeWithFrom(merchantCreateReqVo, req.getMerchantVo());
@@ -1539,4 +1560,20 @@ public class CompanyServiceImpl implements CompanyService {
         financeService.divideSettlement(capitalFlowVo);
     }
 
+    @Override
+    public CompanyResVo findCompanyInvitationReward(CompanyReqVo req) {
+
+        CompanyResVo companyResVo = companyDao.load(req.getId(), CompanyResVo.class);
+        if(!StringHelper.isEmpty(companyResVo) && !StringHelper.isEmpty(companyResVo.getInvitationCompanyId())){
+            companyResVo = companyDao.load(req.getInvitationCompanyId(), CompanyResVo.class);
+            if (!StringHelper.isEmpty(companyResVo)) {
+                CompanyInvitationRuleVo companyInvitationRuleReqVo = new CompanyInvitationRuleVo();
+                companyInvitationRuleReqVo.setCompanyId(req.getInvitationCompanyId());
+                companyInvitationRuleReqVo.setRewardRuleType(1);
+                List<CompanyInvitationRuleVo> companyInvitationRuleVoList = companyInvitationRuleDao.loadList(companyInvitationRuleReqVo, CompanyInvitationRuleVo.class);
+                companyResVo.setCompanyInvitationRewardRuleVoList(companyInvitationRuleVoList);
+            }
+        }
+        return companyResVo;
+    }
 }

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

@@ -75,6 +75,12 @@ public class FinanceServiceImpl implements FinanceService {
             throw new CodeException("该公司暂无银行卡信息，请添加");
         }
         resVo.setBankCardVoList(companyBankCardVoList);
+
+        // 获取公司规则信息
+        CompanyRuleReqVo companyRuleReqVo = new CompanyRuleReqVo();
+        companyRuleReqVo.setCompanyId(extendVo.getId());
+        List<CompanyRuleVo> companyRuleVoList = companyRuleDao.loadList(companyRuleReqVo, CompanyRuleVo.class);
+        resVo.setCompanyRuleVoList(companyRuleVoList);
         return resVo;
     }
 
@@ -271,7 +277,7 @@ public class FinanceServiceImpl implements FinanceService {
                     // 获取提现笔数
                     int withdrawNum = findWithdrawNum(companyResVo.getId(), companyRuleVo.getDateType());
                     // 判断总提现笔数在哪个优惠区间
-                    if (companyRuleVo.getMinNum() <= withdrawNum && withdrawNum <= companyRuleVo.getMaxNum()) {
+                    if (companyRuleVo.getMinNum() <= withdrawNum && withdrawNum < companyRuleVo.getMaxNum()) {
                         withdrawFee = companyRuleVo.getWithdrawFee();
                         break;
                     }

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

@@ -11,6 +11,7 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
 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.CompanyCodeVo;
 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.company.CompanyBankCardReqVo;
@@ -221,7 +222,7 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
      * @return
      */
     @Override
-    public String qrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
+    public CompanyCodeVo qrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
         return companyServiceImpl.generateQrCodeUrl(reqVo);
     }
 

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

@@ -76,7 +76,7 @@ public class UserTask {
     /**
      * 服务费
      */
-    @Scheduled(cron = "0 40 18 * * ?")
+//    @Scheduled(cron = "0 0 1 * * ?")
     public void serviceCharge() {
         CompanyReqVo companyReqVo = new CompanyReqVo();
         companyReqVo.setServiceChargeStatus(1);

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

@@ -2,6 +2,8 @@ package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
+import com.pangding.web.vo.system.pd.company.CompanyRuleVo;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
@@ -16,6 +18,9 @@ public class WithdrawalResVo {
 
     private List<CompanyBankCardVo> bankCardVoList;
 
+    @ApiModelProperty(notes = "提现规则列表")
+    private List<CompanyRuleVo> companyRuleVoList;
+
     public Double getWithdrawTotalCash() {
         return withdrawTotalCash;
     }
@@ -39,4 +44,12 @@ public class WithdrawalResVo {
     public void setCompanyExtend(CompanyExtendVo companyExtend) {
         this.companyExtend = companyExtend;
     }
+
+    public List<CompanyRuleVo> getCompanyRuleVoList() {
+        return companyRuleVoList;
+    }
+
+    public void setCompanyRuleVoList(List<CompanyRuleVo> companyRuleVoList) {
+        this.companyRuleVoList = companyRuleVoList;
+    }
 }

src/main/resources/bootstrap-dev.yml

@@ -13,3 +13,5 @@ msg:
 
 pay:
   paydJumpUrl: /pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=1&merchantId=z0015605022691a5945bbe463141668c&groupId=z0016038113016708b8ad38c637b2f26&groupChannelId=z00160423712018998e6260ffcaf3369&companyId=COMPANYID&pageCode=SD_GROUP
+  miniPayUrl: http://192.168.0.166:8848/pdtravel/src/assets/pay/ourPayment.html?companyId=COMPANYID&merchantId=
+  wechatPayUrl: http://192.168.0.166:8848/pdtravel/src/assets/pay/ourPayment.html?companyId=COMPANYID&merchantId=
\ No newline at end of file