update

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/controller/cost/CostController.java

@@ -341,7 +341,7 @@ public class CostController {
         cashierCallbackUrlDataVo.setSuccess(true);
 
         CashierCallbackUrlDataDataVo cashierCallbackUrlDataDataVo = new CashierCallbackUrlDataDataVo();
-        cashierCallbackUrlDataDataVo.setPayid(Integer.parseInt(IdWorker.getIdStr().substring(8)));
+        cashierCallbackUrlDataDataVo.setPayid(Integer.parseInt(IdWorker.getIdStr().substring(0, 8)));
         cashierCallbackUrlDataDataVo.setPayno(IdWorker.getIdStr());
         cashierCallbackUrlDataDataVo.setPayamount(BigDecimal.ZERO);
         cashierCallbackUrlDataDataVo.setPayuserid(3108);
@@ -365,7 +365,7 @@ public class CostController {
         paydetail.setCashiermothercard("");
         cashierCallbackUrlDataDataVo.setPaydetail(paydetail);
 
-        cashierCallbackUrlDataVo.setData("\"" + JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo) + "\"");
+        cashierCallbackUrlDataVo.setData(JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo));
         cashierCallbackUrlVo.setData(cashierCallbackUrlDataVo);
         this.cashierCallbackUrl(cashierCallbackUrlVo);
         return CostResult.success();
@@ -405,7 +405,7 @@ public class CostController {
         paydetail.setCashiermothercard("");
         cashierCallbackUrlDataDataVo.setPaydetail(paydetail);
 
-        cashierCallbackUrlDataVo.setData("\"" + JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo) + "\"");
+        cashierCallbackUrlDataVo.setData(JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo));
         cashierCallbackUrlVo.setData(cashierCallbackUrlDataVo);
         this.cashierCallbackUrl(cashierCallbackUrlVo);
         return CostResult.success();

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/cost/PayCostServiceImpl.java

@@ -4,15 +4,18 @@ import com.bailuntec.api.bailuntec.cw.request.ApplyMoneyDetail;
 import com.bailuntec.api.bailuntec.cw.request.PostApplyReq;
 import com.bailuntec.api.bailuntec.cw.response.CwResult;
 import com.bailuntec.common.BeanUtils;
+import com.bailuntec.common.JsonUtilByFsJson;
 import com.bailuntec.common.JsonUtilByJackson;
-import com.blt.other.common.exception.BizRuntimeException;
 import com.blt.other.common.exception.RpcException;
 import com.blt.other.module.cost.model.CostDomain;
 import com.blt.other.module.cost.service.CostService;
+import com.blt.other.module.cost.vo.CashierCallbackUrlDataDataVo;
+import com.blt.other.module.cost.vo.CashierCallbackUrlDataVo;
 import com.blt.other.module.cost.vo.TofinanceVo;
 import com.blt.other.module.database.model.CostTofinanceDomain;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import springfox.documentation.spring.web.json.Json;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,4 +72,13 @@ public class PayCostServiceImpl extends AbstractCostService implements CostServi
         costTofinanceService.saveCostToFinanceMsg(costTofinanceDomain);
 
     }
-}
+
+    public static void main(String[] args) {
+
+
+            CashierCallbackUrlDataDataVo cashierCallbackUrlDataDataVo = new CashierCallbackUrlDataDataVo();
+            CashierCallbackUrlDataVo cashierCallbackUrlDataVo =new CashierCallbackUrlDataVo();
+            cashierCallbackUrlDataVo.setData(JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataDataVo));
+            System.out.println(JsonUtilByFsJson.beanToJson(cashierCallbackUrlDataVo));
+        }
+    }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/costcheck/UnSubmitState.java

@@ -27,6 +27,7 @@ public class UnSubmitState extends CostState {
         CostDomain costDomain = costContext.costDomain;
         //校验费用单状态 和 当前处理用户
         if (costDomain.getCostStatus() != CostDomain.STATUS_UN_SUBMIT ||
+                costDomain.getCostStatus() != CostDomain.STATUS_REJECT ||
                 !costDomain.getCreateUserid().equals(costContext.currentUserId)) {
             throw new BizRuntimeException("invalid status");
         }