Merge remote-tracking branch 'origin/qa' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1194,7 +1194,7 @@ public class OrderAdapter {
             if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
                 responseVo.setRefundTips(orderViewStatusDto.getRefundStatusText());
             }
-            if(OrderStatus.COMPLETE.getCode().equals(ordersBean.getStatus())) {
+            if(OrderStatus.COMPLETE.getCode().equals(ordersBean.getStatus()) && null != ordersBean.getGmtCompleteTime() && 0l != ordersBean.getGmtCompleteTime()) {
                 responseVo.setCompleteTime(DateUtil.convert2String(new Date(ordersBean.getGmtCompleteTime()), "yyyy-MM-dd HH:mm:ss"));
             }
             responseVo.setTakeMealFlows(getTakeMealFlows(ordersBean));

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2305,10 +2305,10 @@ public class OrderServiceImpl implements Orderservice {
         if (totalAmount > 0 && StringUtils.isBlank(cardCode) && Objects.isNull(createPrepayRequestDto.getUnionPayCard())) {
             createOrderResponse.setPaySuccess(false);
         }
-        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.COMB.getIndex().equals(orderPayResponse.getPayMode())){
+        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.COMB.getEbcode().equals(orderPayResponse.getPayMode())){
             createOrderResponse.setPaySuccess(false);
         }
-        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getIndex().equals(orderPayResponse.getPayMode())){
+        else if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getEbcode().equals(orderPayResponse.getPayMode())){
             createOrderResponse.setPaySuccess(true);
         }
         else {
@@ -2584,7 +2584,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
             orderPayResponse.setOrderId(orderBean.getOid());
-            orderPayResponse.setPayMode(PayChannelType.SVC.getIndex()+"");
+            orderPayResponse.setPayMode(PayChannelType.SVC.getEbcode());
         }
         return orderPayResponse;
     }
@@ -3282,7 +3282,7 @@ public class OrderServiceImpl implements Orderservice {
         orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
         orderPayResponse.setPartnerId(orderBean.getCompanyId());
         orderPayResponse.setOrderId(orderBean.getOid());
-        orderPayResponse.setPayMode(PayChannelType.COMB.getIndex()+"");
+        orderPayResponse.setPayMode(PayChannelType.COMB.getEbcode());
         //隐射关系
         redisCache.save(RedisUtil.getPaymentTransIdOrderKey(payPlatform.getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
         //加入轮训队列

order-application-service/src/main/java/cn/freemud/utils/DateUtils.java

@@ -14,7 +14,7 @@ public class DateUtils {
         if (date == null ){
             return null;
         }
-        String[] week={"(周一)","(周二)","(周三)","(周四)","(周五)","(周六)","(周日)"};
+        String[] week={"(周日)","(周一)","(周二)","(周三)","(周四)","(周五)","(周六)"};
         Calendar calendar =Calendar.getInstance();
         calendar.setTime(date);
         int w = calendar.get(Calendar.DAY_OF_WEEK) -1 ;