更新ApplyDetail validEndDate validStartDate 类型

更新common.properties文件

src/dao/cn/com/yskj/zfdm/entity/zfd/ZfdServiceApplyDetail.java

@@ -1,5 +1,7 @@
 package cn.com.yskj.zfdm.entity.zfd;
 
+import java.time.LocalDateTime;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -36,9 +38,9 @@ public class ZfdServiceApplyDetail extends StringUUIDEntity {
     /*** 券发放平台;消费加油券充值订单后回填 */
     private String couTypeTitle;
     /*** 有效期结束时间;消费加油券充值订单后回填 */
-    private String validEndDate;
+    private LocalDateTime validEndDate;
     /*** 有效开始时间;消费加油券充值订单后回填 */
-    private String validStartDate;
+    private LocalDateTime validStartDate;
     /*** 有效开始日期;消费加油券充值订单后回填 */
     private String startDate;
     /*** 有效结束日期;消费加油券充值订单后回填 */
@@ -162,23 +164,23 @@ public class ZfdServiceApplyDetail extends StringUUIDEntity {
 
     /*** 有效期结束时间;消费加油券充值订单后回填 */
     @Column(name = "VALID_END_DATE")
-    public String getValidEndDate() {
+    public LocalDateTime getValidEndDate() {
         return this.validEndDate;
     }
 
     /*** 有效期结束时间;消费加油券充值订单后回填 */
-    public void setValidEndDate(String validEndDate) {
+    public void setValidEndDate(LocalDateTime validEndDate) {
         this.validEndDate = validEndDate;
     }
 
     /*** 有效开始时间;消费加油券充值订单后回填 */
     @Column(name = "VALID_START_DATE")
-    public String getValidStartDate() {
+    public LocalDateTime getValidStartDate() {
         return this.validStartDate;
     }
 
     /*** 有效开始时间;消费加油券充值订单后回填 */
-    public void setValidStartDate(String validStartDate) {
+    public void setValidStartDate(LocalDateTime validStartDate) {
         this.validStartDate = validStartDate;
     }
 

src/manager/cn/com/yskj/zfdm/manager/service/application/ServiceRequestInquiryManagerImpl.java

@@ -1,10 +1,10 @@
 package cn.com.yskj.zfdm.manager.service.application;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import javax.validation.Valid;
-import javax.xml.ws.Response;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -127,8 +127,24 @@ public class ServiceRequestInquiryManagerImpl extends AbstractManager implements
 				//激活后 更新applydetail表
 				applyDetailList.get(0).setCouNo(rechargeOrderResponse.getData().get(0).getCouNo());
 				applyDetailList.get(0).setCouTypeTitle(rechargeOrderResponse.getData().get(0).getCouTypeTitle());
-				applyDetailList.get(0).setValidEndDate(rechargeOrderResponse.getData().get(0).getValidEndDate());
-				applyDetailList.get(0).setValidStartDate(rechargeOrderResponse.getData().get(0).getValidStartDate());
+				try {
+					LocalDateTime validEndDate = LocalDateTime.parse(rechargeOrderResponse.getData().get(0).getValidEndDate(),DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+					applyDetailList.get(0).setValidEndDate(validEndDate);
+				} catch (Exception e) {
+					e.printStackTrace();
+					String errorMsg = "汇联通油券平台返回有效期结束时间格式错误：" + rechargeOrderResponse.getData().get(0).getValidEndDate();
+					logger.info(errorMsg);
+					throw new ManagerException(errorMsg);
+				}
+				try {
+					LocalDateTime validStartDate = LocalDateTime.parse(rechargeOrderResponse.getData().get(0).getValidStartDate(),DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+					applyDetailList.get(0).setValidStartDate(validStartDate);
+				} catch (Exception e) {
+					e.printStackTrace();
+					String errorMsg = "汇联通油券平台返回有效期起始时间格式错误：" + rechargeOrderResponse.getData().get(0).getValidStartDate();
+					logger.info(errorMsg);
+					throw new ManagerException(errorMsg);
+				}
 				applyDetailList.get(0).setStartDate(rechargeOrderResponse.getData().get(0).getStartDate());
 				applyDetailList.get(0).setEndDate(rechargeOrderResponse.getData().get(0).getEndDate());
 				applyDetailList.get(0).setCouThresholdAmount(Integer.valueOf(rechargeOrderResponse.getData().get(0).getCouThresholdAmount()));
@@ -167,7 +183,12 @@ public class ServiceRequestInquiryManagerImpl extends AbstractManager implements
 				//购买后更新applydetail表
 				String rechargeOrderId = rechargeResponse.getData().getRechargeOrderId();
 				applyDetailList.get(0).setRechargeOrderId(rechargeOrderId);
-			}else{
+			}
+//			else if(){
+//				//若已购买 未激活 则使用本地订单号 查询rechargeOrderId
+//				//TODO
+//			}
+			else{
 				//调用失败
 				String errorMsg = "调用汇联通加油券平台油券购买接口失败：" + rechargeResponse.getMsg() + ",返回码：" + rechargeResponse.getRespCode();
 				logger.info(errorMsg);

war/WEB-INF/conf/common.properties

@@ -6,13 +6,13 @@ runtime_enviroment=dev
 gascouponUrl=http://www.hltgz.com:4010/api/v2/execute.json
 gascouponSignCode=7765C4C7
 gascouponAccessCode=B4D8BA3440B94306B08A17E05EB55D1D
-gascouponChannelCode: GSZFD
+gascouponChannelCode=GSZFD
 gascouponDistributorId=test
 
 # gas coupon product
 #runtime_enviroment=prod
-#gascouponUrl=http://www.hltgz.com:4010/api/v2/execute.json
-#gascouponSignCode=7765C4C7
-#gascouponAccessCode=B4D8BA3440B94306B08A17E05EB55D1D
-#gascouponChannelCode: GSZFD
-#gascouponDistributorId=test
+#gascouponUrl=
+#gascouponSignCode=
+#gascouponAccessCode=
+#gascouponChannelCode=
+#gascouponDistributorId=