Просмотр исходного кода

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/kede-server.git into test

anderx лет назад: 7
Родитель
Сommit
36232984e3

+ 2 - 2
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -158,7 +158,7 @@ public class ExportExcelUtil {
 					switch (comment[i]) {
 					case "平台流水编号": o = ob.getBillNo(); break;
 					case "平台流水时间": o = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(ob.getCreateTime()); break;
-					case "交易金额": o = ob.getTransactionAmount().toString() + "万元"; break;
+					case "交易金额(万元)": o = ob.getTransactionAmount().toString() ; break;
 					case "付款方": o = ob.getPayerName(); break;
 					case "收款方": o = ob.getPayeeName(); break;
 					case "流水科目": 
@@ -404,7 +404,7 @@ public class ExportExcelUtil {
 					case "签单时间": o = ob.getSignDate(); break;
 					case "客户名称": o = ob.getUserName(); break;
 					case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus());break;
-					case "签单金额": o = ob.getTotalAmount().toString(); break;
+					case "签单金额(万元)": o = ob.getTotalAmount().toString(); break;
 					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
 					case "结算状态": o = LiquidationNewState.getValueByCode(ob.getLiquidationStatus()); break;
 					case "已收款": o = ob.getSettlementAmount().toString(); break;

+ 1 - 1
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -31,7 +31,7 @@ import com.goafanti.order.service.OrderBillService;
 import com.goafanti.order.service.OrderRefundService;
 
 @RestController
-@RequestMapping(value = "/api/admin/financial")
+@RequestMapping(value = "/open/api/admin/financial")
 public class FundManagerOrderApiController extends CertifyApiController {
 	@Resource
 	private FundManageOrderService fundManageOrderServiceImpl;