|
|
@@ -21,6 +21,7 @@ import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.controller.CertifyApiController;
|
|
|
import com.goafanti.common.model.TOrderBack;
|
|
|
import com.goafanti.common.model.TOrderBillNew;
|
|
|
+import com.goafanti.common.model.TOrderNew;
|
|
|
import com.goafanti.common.model.TOrderRefund;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
@@ -131,7 +132,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
//流水时间处理
|
|
|
- if(StringUtils.isNotEmpty(billNew.getFinancialPayTimes())){
|
|
|
+ //if(StringUtils.isNotEmpty(billNew.getFinancialPayTimes())){
|
|
|
try {
|
|
|
billNew.setFinancialPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(billNew.getFinancialPayTimes()));
|
|
|
} catch (ParseException e) {
|
|
|
@@ -139,7 +140,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError("", "财务流水时间有误!"));
|
|
|
return res;
|
|
|
}
|
|
|
- }
|
|
|
+ //}
|
|
|
Integer i = fundManageOrderServiceImpl.addReceiptsFlow(billNew);
|
|
|
if(i>0){
|
|
|
res.setData("新增收款记录成功!");
|
|
|
@@ -204,7 +205,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError("", "备注长度不能大于255"));
|
|
|
return res;
|
|
|
}
|
|
|
- if(StringUtils.isNotEmpty(orderRefund.getFinancialPayTimes())){
|
|
|
+ //if(StringUtils.isNotEmpty(orderRefund.getFinancialPayTimes())){
|
|
|
try {
|
|
|
orderRefund.setFinancialPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(orderRefund.getFinancialPayTimes()));
|
|
|
} catch (ParseException e) {
|
|
|
@@ -212,7 +213,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
res.getError().add(buildError("", "财务流水时间有误!"));
|
|
|
return res;
|
|
|
}
|
|
|
- }
|
|
|
+ //}
|
|
|
int r = fundManageOrderServiceImpl.addRefundFlow(orderRefund);
|
|
|
if(r>0){
|
|
|
res.setData("退款记录新增成功!");
|
|
|
@@ -318,5 +319,22 @@ public class FundManagerOrderApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 修改合同编号
|
|
|
+ * @param orderNew
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @RequestMapping(value="/updateContractNo", method = RequestMethod.POST)
|
|
|
+ public Result updateContractNo(TOrderNew orderNew){
|
|
|
+ Result res = new Result();
|
|
|
+ if(StringUtils.isBlank(orderNew.getContractNo())){
|
|
|
+ res.getError().add(buildError("", "合同编号不能为空!"));
|
|
|
+ return res;
|
|
|
+ } else if(orderNew.getContractNo().length()>32){
|
|
|
+ res.getError().add(buildError("", "合同编号长度不能大于32!"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+ res.setData(fundManageOrderServiceImpl.updateContractNo(orderNew));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
}
|