fix:调整合同生成逻辑

jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/order/entity/OrderInfo.java

@@ -97,7 +97,7 @@ public class OrderInfo implements Serializable {
     /**里程*/
     private java.lang.String mileage;
     /**购车时间*/
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd")
     private java.util.Date buyTime;
     /**车辆购置价*/
     private java.math.BigDecimal buyMoney;

jeecg-module-miniapp/src/main/java/org/jeecg/modules/miniapp/order/service/impl/OrderServiceImpl.java

@@ -90,15 +90,14 @@ public class OrderServiceImpl implements OrderService {
         // 当前登录用户
         appOrder.setCreateBy(user.getNickName());
         appOrder.setCreateTime(new Date());
-        if (StrUtil.isBlank(appOrder.getProductContractTemp())){
-            throw new RuntimeException("产品模板合同为空，无法生成合同，请配置合同模板！");
+        if (StrUtil.isNotBlank(appOrder.getProductContractTemp())){
+            BeanUtils.copyProperties(appOrder, orderInfo);
+            BeanUtils.copyProperties(appOrderCarList.get(0),orderInfo);
+            BeanUtils.copyProperties(appOrderVoucherList.get(0),orderInfo);
+            BeanUtils.copyProperties(appOrderFinanceList.get(0),orderInfo);
+            String contractUrl = this.creatContractUrl(orderInfo);
+            appOrder.setContractUrl(contractUrl);
         }
-        BeanUtils.copyProperties(appOrder, orderInfo);
-        BeanUtils.copyProperties(appOrderCarList.get(0),orderInfo);
-        BeanUtils.copyProperties(appOrderVoucherList.get(0),orderInfo);
-        BeanUtils.copyProperties(appOrderFinanceList.get(0),orderInfo);
-        String contractUrl = this.creatContractUrl(orderInfo);
-        appOrder.setContractUrl(contractUrl);
         appOrderMapper.insert(appOrder);
         if(appOrderCarList!=null && appOrderCarList.size()>0) {
             for(AppOrderCar entity:appOrderCarList) {