Преглед изворни кода

请求时间和返回时间 格式修复

wuxw пре 7 година
родитељ
комит
e080491129

+ 5 - 2
Api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java

@@ -10,6 +10,7 @@ import com.java110.common.constant.ServiceCodeConstant;
 import com.java110.common.exception.ListenerExecuteException;
 import com.java110.common.util.Assert;
 import com.java110.common.util.BeanConvertUtil;
+import com.java110.common.util.DateUtil;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
@@ -183,8 +184,10 @@ public class PayFeeListener extends AbstractServiceApiDataFlowListener {
         endCalender.setTime(endTime);
         endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
         feeInfo.setEndTime(endCalender.getTime());
-        BeanConvertUtil.beanCovertMap(feeInfo);
-        businessFee.putAll(BeanConvertUtil.beanCovertMap(feeInfo));
+        Map feeMap = BeanConvertUtil.beanCovertMap(feeInfo);
+        feeMap.put("startTime", DateUtil.getFormatTimeString(feeInfo.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
+        feeMap.put("endTime", DateUtil.getFormatTimeString(feeInfo.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+        businessFee.putAll(feeMap);
         business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFee", businessFee);
 
         return business;

+ 2 - 2
WebService/src/main/resources/components/property-pay/propertyPay.js

@@ -17,9 +17,9 @@
         watch:{
             "propertyPayInfo.cycles":{//深度监听,可监听到对象、数组的变化
                 handler(val, oldVal){
-                    vc.component.propertyPayInfo.receivableAmount = (parseFloat(vc.component.propertyPayInfo.builtUpArea)
+                    vc.component.propertyPayInfo.receivableAmount = ((parseFloat(vc.component.propertyPayInfo.builtUpArea)
                                                                     * parseFloat(vc.component.propertyPayInfo.squarePrice)
-                                                                    + parseFloat(vc.component.propertyPayInfo.additionalAmount)) * parseFloat(val);
+                                                                    + parseFloat(vc.component.propertyPayInfo.additionalAmount)) * parseFloat(val)).toFixed(2);
                     vc.component.propertyPayInfo.receivedAmount = vc.component.propertyPayInfo.receivableAmount;
                 },
                 deep:true