Merge branch 'jxl-datongfensi' into test-ecs

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java

@@ -104,7 +104,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     private Integer payCountdownMinute;
     @ApiModelProperty(value = " 快递单号[废弃]")
     private String mailNo;
-    @ApiModelProperty(value = " 发货时间[废弃]")
+    @ApiModelProperty(value = " 发货时间")
     private String deliveryTime;
     @ApiModelProperty(value = " 物流公司姓名[废弃]")
     private String logisticsCompany;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java

@@ -776,7 +776,13 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         LocalDateTime canRefundTimeDateTime = null;
         if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue() || orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue()) {
             try {
-                canRefundTimeDateTime = LocalDateTime.parse(orderVo.getPayTime(), DTF_YMD_HMS).plusDays(7);
+                // 允许退款修改成发货时间+14天
+//                canRefundTimeDateTime = LocalDateTime.parse(orderVo.getPayTime(), DTF_YMD_HMS).plusDays(7);
+                if (StringUtil.isBlank(orderVo.getDeliveryTime())) {
+                    canRefundTimeDateTime = LocalDateTime.parse(orderVo.getPayTime(), DTF_YMD_HMS).plusDays(7);
+                }else {
+                    canRefundTimeDateTime = LocalDateTime.parse(orderVo.getDeliveryTime(), DTF_YMD_HMS).plusDays(14);
+                }
             } catch (Exception e) {
                 e.printStackTrace();
             }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -618,7 +618,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();
         LinkedList<Object[]> sqlsOrderSku = CollectionUtil.linkedListObjectArr();
         LinkedList<Object[]> sqlsMail = CollectionUtil.linkedListObjectArr();
-        sqls.add(SqlMapping.get("goblin_order.store.express"));
+        sqls.add(SqlMapping.get("goblin_order.store.expressTime"));
         sqls.add(SqlMapping.get("goblin_order.store.orderSkuStatus"));
         sqls.add(SqlMapping.get("goblin_order.mail"));
 //        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
@@ -701,13 +701,15 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_13.getValue());
         log.setRemark("发货：orderId=[" + orderId + "],orderSkuId=[" + StringUtils.join(skuIds, ",") + "],mailNo=[" + mailNo + "]");
 
+        // 发货时间
+        orderVo.setDeliveryTime(nowStr);
         //redis
         redisUtils.setGoblinOrder(orderId, orderVo);
         //mongo
         mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
         //mysql
         sqlsOrder.add(new Object[]{
-                orderVo.getStatus(), now, orderId, now, now
+                orderVo.getStatus(), now, now, orderId, now, now
         });
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                 SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku, sqlsMail));

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -119,6 +119,7 @@ goblin_order.store.orderSkuPush=UPDATE goblin_order_sku SET status = ? , updated
 goblin_order.store.orderPush=UPDATE goblin_store_order SET status = ? ,zhengzai_status=?, updated_at = ?,push_time = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 
 goblin_order.store.express=UPDATE goblin_store_order SET status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.expressTime=UPDATE goblin_store_order SET status = ?, delivery_time = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.mail=INSERT INTO goblin_mail (`mail_id`,`order_id`,`mail_no`,`delivery_time`,`logistics_company`,`order_sku_ids`,`created_at`) VALUES (?,?,?,?,?,?,?)
 goblin_order.mail.update=UPDATE goblin_mail SET mail_no = ? , updated_at = ? WHERE mail_id = ?
 goblin_order.store.address=UPDATE goblin_order_attr SET express_contacts = ? ,express_address_detail = ? , express_phone = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)