修改用户二维码生成

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

@@ -36,6 +36,7 @@ public class CompanyExtendDaoImpl extends BaseDaoImpl implements CompanyExtendDa
 
     @Override
     public void updateCompanyMoney(UpdateCompanyMoneyReqVo req) {
+        System.out.println("re.money:" + req.getNewWithdrawTotalCash());
         this.updateSql(UPDATE_COMPANY_MONEY, req);
     }
 

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

@@ -21,6 +21,9 @@ public class CapitalFlowDaoImpl extends BaseDaoImpl implements CapitalFlowDao {
         table.add(QUERY_LIST, "SELECT * 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("merchantName"," AND merchant_name LIKE concat(?,'%') ")
+                .add("productName"," AND product_name LIKE concat(?,'%') ")
+                .add("orderType"," AND order_type = ? ")
                 .add("startOrderTime", " AND order_time >= ? ")
                 .add("endOrderTime", " AND order_time <= ? ")
                 .add("startPlayDate", " AND play_date >= ? ")
@@ -41,6 +44,9 @@ public class CapitalFlowDaoImpl extends BaseDaoImpl implements CapitalFlowDao {
                 " 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("merchantName"," AND merchant_name LIKE concat(?,'%') ")
+                .add("productName"," AND product_name LIKE concat(?,'%') ")
+                .add("orderType"," AND order_type = ? ")
                 .add("startOrderTime", " AND order_time >= ? ")
                 .add("endOrderTime", " AND order_time <= ? ")
                 .add("startPlayDate", " AND play_date >= ? ")

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

@@ -26,6 +26,7 @@ import com.pangding.web.vo.system.res.company.CompanyResVo;
 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;
@@ -468,10 +469,15 @@ public class FinanceServiceImpl implements FinanceService {
             // 退款
             money = -money;
         }
+        System.out.println("money:" + money);
+        if(StringHelper.isEmpty(money)){
+            throw new CodeException("金额不能为空");
+        }
         //修改公司余额
         UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
         updateCompanyMoneyReqVo.setCompanyId(req.getCompanyId());
         updateCompanyMoneyReqVo.setNewWithdrawTotalCash(money);
+        System.out.println("update:" + JsonHelper.serialize(updateCompanyMoneyReqVo));
         companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
 
         CompanyResVo companyVo = companyDao.load(req.getCompanyId(), CompanyResVo.class);
@@ -480,18 +486,20 @@ public class FinanceServiceImpl implements FinanceService {
         }
         double oldMoney = companyVo.getWithdrawTotalCash() - money;
         // 添加资金流水
-        CapitalFlowReqVo capitalFlowReqVo = new CapitalFlowReqVo();
-        capitalFlowReqVo.setOrderId(req.getOrderId());
-        CapitalFlowVo capitalFlowVo = capitalFlowDao.load(capitalFlowReqVo, CapitalFlowVo.class);
+        String id = StringHelper.getMD5Id(req.getOrderId(), req.getOrderMonetDetailId(), req.getCompanyId());
+//        CapitalFlowReqVo capitalFlowReqVo = new CapitalFlowReqVo();
+//        capitalFlowReqVo.setOrderId(req.getOrderId());
+        CapitalFlowVo capitalFlowVo = capitalFlowDao.load(id, CapitalFlowVo.class);
         if (StringHelper.isEmpty(capitalFlowVo)) {
             capitalFlowVo = new CapitalFlowVo();
             ObjectHelper.writeWithFrom(capitalFlowVo, req);
+            capitalFlowVo.setId(id);
             capitalFlowVo.setStatus(1);
             capitalFlowVo.setTime(DateHelper.getNow());
             capitalFlowVo.setActualMoney(money);
             capitalFlowVo.setInitMoney(oldMoney);
             capitalFlowVo.setFinalMoney(capitalFlowVo.getActualMoney() + capitalFlowVo.getInitMoney());
-            capitalFlowDao.save(capitalFlowVo);
+            capitalFlowDao.create(capitalFlowVo);
         } else {
             ObjectHelper.writeWithFrom(capitalFlowVo, req);
             capitalFlowVo.setStatus(1);