添加修改公司消息

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

@@ -311,7 +311,7 @@ public class PangdingManagementController {
     }
 
     @RequestMapping(value = "updateCompanyMoney",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public  ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req){
+    public  ResponseResult<String> updateCompanyMoney(@RequestBody UpdateCompanyMoneyReqVo req){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",req.getCompanyId())
                 .notBlankCheck("money", req.getMoney())

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

@@ -956,8 +956,8 @@ public class CompanyServiceImpl implements CompanyService {
         try{
             // 可提现余额
             double companyMoney = companyExtendVo.getWithdrawTotalCash();
-            req = new UpdateCompanyMoneyReqVo();
-            req.setCompanyId(companyVo.getId());
+//            req = new UpdateCompanyMoneyReqVo();
+//            req.setCompanyId(companyVo.getId());
 
             if(CompanyConstant.MONEY_TYPE_FZ == req.getMoneyType()
                     || CompanyConstant.MONEY_TYPE_ZZ == req.getMoneyType()
@@ -965,8 +965,9 @@ public class CompanyServiceImpl implements CompanyService {
                 // 分账 转账 充值
                 companyMoney += req.getMoney();
             }
-            if(CompanyConstant.MONEY_TYPE_REFUND == req.getMoneyType()){
-                // 退款
+            if(CompanyConstant.MONEY_TYPE_REFUND == req.getMoneyType()
+                    || CompanyConstant.MONEY_TYPE_TX == req.getMoneyType()){
+                // 退款 提现
                 companyMoney -= req.getMoney();
             }
 //            int orderMoneyType = 0;

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

 package com.pangding.web.authority.vo.resvo;
 
-import com.pangding.web.authority.vo.MsgVo;
 
-public class GetCompanyMsgResVo extends MsgVo{
+public class GetCompanyMsgResVo{
 
     private String companyId;
 
     private String companyName;
 
+    private String msgId;
+
+    private String msgTitle;
+
+    private String msgContent;
+
+    private String msgUrl;
+
+    private String msgPicUrl;
+
+    private int msgType;
+
+    private int msgStatus;
+
+    private int msgSort;
+
     public String getCompanyId() {
         return companyId;
     }
@@ -23,4 +38,68 @@ public class GetCompanyMsgResVo extends MsgVo{
     public void setCompanyName(String companyName) {
         this.companyName = companyName;
     }
+
+    public String getMsgId() {
+        return msgId;
+    }
+
+    public void setMsgId(String msgId) {
+        this.msgId = msgId;
+    }
+
+    public String getMsgTitle() {
+        return msgTitle;
+    }
+
+    public void setMsgTitle(String msgTitle) {
+        this.msgTitle = msgTitle;
+    }
+
+    public String getMsgContent() {
+        return msgContent;
+    }
+
+    public void setMsgContent(String msgContent) {
+        this.msgContent = msgContent;
+    }
+
+    public String getMsgUrl() {
+        return msgUrl;
+    }
+
+    public void setMsgUrl(String msgUrl) {
+        this.msgUrl = msgUrl;
+    }
+
+    public String getMsgPicUrl() {
+        return msgPicUrl;
+    }
+
+    public void setMsgPicUrl(String msgPicUrl) {
+        this.msgPicUrl = msgPicUrl;
+    }
+
+    public int getMsgType() {
+        return msgType;
+    }
+
+    public void setMsgType(int msgType) {
+        this.msgType = msgType;
+    }
+
+    public int getMsgStatus() {
+        return msgStatus;
+    }
+
+    public void setMsgStatus(int msgStatus) {
+        this.msgStatus = msgStatus;
+    }
+
+    public int getMsgSort() {
+        return msgSort;
+    }
+
+    public void setMsgSort(int msgSort) {
+        this.msgSort = msgSort;
+    }
 }