添加常量

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

@@ -309,4 +309,14 @@ public class PangdingManagementController {
         companyServiceImpl.examineConfig(reqVo);
         return new ResponseResult();
     }
+
+    @RequestMapping(value = "updateCompanyMoney",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public  ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req){
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId",req.getCompanyId())
+                .notBlankCheck("money", req.getMoney())
+                .notBlankCheck("moneyType", req.getMoney())
+                .checkException();
+        return companyServiceImpl.updateCompanyMoney(req);
+    }
 }

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

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+public interface CompanyMoneyDetailDao extends BaseDao {
+}

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

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.CompanyMoneyDetailDao;
+import com.pangding.web.authority.vo.CompanyMoneyDateilVo;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompanyMoneyDetailDaoImpl extends BaseDaoImpl implements CompanyMoneyDetailDao {
+
+    @Override
+    protected void init() {
+        register(CompanyMoneyDateilVo.class);
+    }
+}

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

@@ -9,6 +9,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.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
 
 import java.util.List;
 
@@ -179,4 +180,6 @@ public interface CompanyService{
      * @return
      */
     void examineConfig(ExamineConfigReqVo reqVo);
+
+    ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req);
 }

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

@@ -9,18 +9,19 @@ import com.pangding.web.authority.service.PangdingPartnerService;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.util.CompanyBankCardConstant;
 import com.pangding.web.authority.util.CompanyConstant;
-import com.pangding.web.authority.util.RoleConstant;
 import com.pangding.web.authority.util.RsaConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.util.RSAUtils;
+import com.sun.org.apache.regexp.internal.RE;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
+import org.aspectj.apache.bcel.classfile.Code;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -60,6 +61,8 @@ public class CompanyServiceImpl implements CompanyService {
     private CompanyDivideRuleDao companyDivideRuleDao;
     @Autowired
     private RoleDao roleDaoImpl;
+    @Autowired
+    private CompanyMoneyDetailDao companyMoneyDetailDao;
 
     /**
      * 修改公司信息
@@ -911,4 +914,61 @@ public class CompanyServiceImpl implements CompanyService {
         userRoleDaoImpl.create(userRoleVo);
     }
 
+
+
+    @Override
+    public ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req){
+        CompanyVo companyVo = companyDao.load(req.getCompanyId(), CompanyVo.class);
+        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(req.getCompanyId(), CompanyExtendVo.class);
+        if(StringHelper.isEmpty(companyVo) && StringHelper.isEmpty(companyExtendVo)){
+           throw new CodeException("未找到公司信息");
+        }
+        try{
+            // 可提现余额
+            double companyMoney = companyExtendVo.getWithdrawTotalCash();
+            req = new UpdateCompanyMoneyReqVo();
+            req.setCompanyId(companyVo.getId());
+
+            if(CompanyConstant.MONEY_TYPE_FZ == req.getMoneyType()
+                    || CompanyConstant.MONEY_TYPE_ZZ == req.getMoneyType()
+                    || CompanyConstant.MONEY_TYPE_CZ == req.getMoneyType() ){
+                // 分账 转账 充值
+                companyMoney += req.getMoney();
+            }
+            if(CompanyConstant.MONEY_TYPE_REFUND == req.getMoneyType()){
+                // 退款
+                companyMoney -= req.getMoney();
+            }
+//            int orderMoneyType = 0;
+//            int divideMoneyType = 0;
+//            List<CompanyMoneyDateilVo> companyMoneyDateilVoList = companyMoneyDetailDao.loadList(req, CompanyMoneyDateilVo.class);
+//            for(int i = 0; i < companyMoneyDateilVoList.size(); i++){
+//                CompanyMoneyDateilVo companyMoneyDateilVo = companyMoneyDateilVoList.get(i);
+//                if(CompanyConstant.MONEY_TYPE_ORDER == companyMoneyDateilVo.getMoneyType()){
+//                    orderMoneyType = 1;
+//                    if(CompanyConstant.MONEY_TYPE_REFUND == req.getMoneyType()){
+//                        companyMoneyDateilVo.setMoney(companyMoneyDateilVo.getMoney() - money);
+//                        companyMoneyDetailDao.update(companyMoneyDateilVo);
+//                    }else{
+//                        companyMoneyDateilVo.setMoney(companyMoneyDateilVo.getMoney() + addMoney);
+//                        companyMoneyDetailDao.update(companyMoneyDateilVo);
+//                    }
+//                }
+//                if(CompanyConstant.MONEY_TYPE_DIVIDE == companyMoneyDateilVo.getMoneyType()){
+//                    divideMoneyType = 1;
+//                    if(CompanyConstant.MONEY_TYPE_ZZ == req.getMoneyType()){
+//                        companyMoneyDateilVo.setMoney(companyMoneyDateilVo.getMoney() + addMoney);
+//                        companyMoneyDetailDao.update(companyMoneyDateilVo);
+//                    }
+//                }
+//            }
+
+            companyExtendVo.setWithdrawTotalCash(companyMoney);
+            companyExtendDaoImpl.update(companyExtendVo);
+            return ResponseResult.result("处理完成");
+        }catch (CodeException e){
+             throw new CodeException("");
+        }
+    }
+
 }

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

@@ -162,6 +162,23 @@ public class CompanyConstant {
      */
     public static final String PD_COMPANY_ID = "10001";
 
+    /**
+     * 0:分账、1:提现、2:充值、3:退款、4:平台转账给商户
+     */
+    public static final int MONEY_TYPE_FZ = 0;
+
+    public static final int MONEY_TYPE_TX = 1;
+
+    public static final int MONEY_TYPE_CZ = 2;
+
+    public static final int MONEY_TYPE_REFUND = 3;
+
+    public static final int MONEY_TYPE_ZZ = 4;
+
+    public static final int MONEY_TYPE_ORDER= 0;
+
+    public static final int MONEY_TYPE_DIVIDE = 1;
+
 
 
 }

src/main/java/com/pangding/web/authority/vo/CompanyMoneyDateilVo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+@TableAnnotation("pd_company_money_detail")
+public class CompanyMoneyDateilVo {
+
+    private String id;
+
+    @TableAnnotation("company_id")
+    private String companyId;
+
+    private double money;
+
+    @TableAnnotation("money_type")
+    private int moneyType;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public double getMoney() {
+        return money;
+    }
+
+    public void setMoney(double money) {
+        this.money = money;
+    }
+
+    public int getMoneyType() {
+        return moneyType;
+    }
+
+    public void setMoneyType(int moneyType) {
+        this.moneyType = moneyType;
+    }
+}

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

+package com.pangding.web.authority.vo.reqvo;
+
+public class UpdateCompanyMoneyReqVo {
+
+    private String companyId;
+
+    private double money;
+
+    private int moneyType;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public double getMoney() {
+        return money;
+    }
+
+    public void setMoney(double money) {
+        this.money = money;
+    }
+
+    public int getMoneyType() {
+        return moneyType;
+    }
+
+    public void setMoneyType(int moneyType) {
+        this.moneyType = moneyType;
+    }
+}

src/main/resources/bootstrap.yml

 spring:
   profiles:
-    active: test
+    active: dev
   application:
     name: pd-user
   cloud:
+     #datasource:
+      # url: jdbc:mysql://192.168.0.205:3306/pd_manager?useUnicode=true&characterEncoding=utf-8&characterSetResults=utf-8&zeroDateTimeBehavior=convertToNull
+      # username: root
+      # password: 123456
     config:
       # base为所有服务的公共配置，pd-db-system为需要连接的数据库配置,${spring.application.name}为当前程序的配置，3个配置组合才为当前程序的启动配置
       name: base,pd-db-user,${spring.application.name}
@@ -19,8 +23,6 @@ spring:
         max-interval: 1000
         max-attempts: 1000
         multiplier: 1.1
-yzg:
-  PrintSql: true
 
 rsa:
   privatekey: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALZh0s9zLNdnF6OxW9R9nHXHewBs0YwTC9cpXVrjHMkrF+p/WLSwQItzwv+rTaEXCZazGxU2uv/IS58YEhG2i6HqwFJDZwgkQ3TimrGXkZ7w5x7JLXoAvIDgJRNJnL2qOPn1nw47DmZ+VsTK3nK/CPtyeJ+QWYgHXxQDcEyv8911AgMBAAECgYAyLaHhf4+zx+JiIBbi1JhqczKtQEM65baZQQE1U00FL/0JgHX4aJGpjHT3ALt/+aWit65Y3NEANKxRnj7CbtXlhG65zWGfZXoieqFlOxRFcHIWRpEFCtlnflGY1Os0n6dJ335YDWKuxbvq4TiLs6WIG8rIdD6tK1x49VNdukX+dQJBAOPX/rrQHjUuVK6kidhgbZXAjqRfQri50rFOxmvZvfpO+Fn7AuSA5NxXLj+7Jf/5SPJBXP5OhEiNIhh3qnoy1UcCQQDM653qBdR3KR3ro89mzc0RKJjooZVttqHc/FV9vd2dUPYGk0h94mSB2+ofsoOIZYa5eh0lDyBISbofnKjjVwVjAkA70HeSKZLUmU4n7xA1GtOKDdwksNF+V2JFpA2ZQLeMH/E5BhmzTVdHtSdyGbqXIaWR27EDHi/CMDL0Q24g2Hl/AkBP87YfMrsc6vvzjmxDbhSOl0phqXnF3rX0pLcuYj/vO0Fie2CTTRtt10HXsCzFsOcJwu1QIkC0M5/c6aCzYqaFAkBOaY9LoJXr2Fjga4XXWxE0oRvjCaV0p/dKTRAzXKdgqc6ADXc/OiAPr4nH48vnPH2w30nk17CR0WeMqhhgpMtM