Submit by Strive

Date 2021/03/24
Project End

aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderMobile.java

@@ -52,6 +52,8 @@ public class OrderMobile {
     /*区县*/
     private String area;
 
+    private String isSevenDay;
+
     private long time;
 
     private String nickname;

aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java

@@ -328,7 +328,8 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
 
             List<OrderMobile> orderMobiles = orderMapper.orderFall(orderMobileDto);
             for (OrderMobile orderMobile : orderMobiles) {
-                if (orderMobileDto.getId() != null && orderMobile.getStatus().equals("1")) {
+                if (StringUtils.equals(orderMobile.getStatus(), "1")) {
+                    //计算超时时间
                     Date orderTime = DateFormatUtils.formatDate(orderMobile.getOrderTime(), "yyyy-MM-dd HH:mm:ss");
                     Calendar calendar = Calendar.getInstance();
                     calendar.setTime(orderTime);
@@ -342,6 +343,19 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
                     }
                 }
 
+                //支付是否超过7天
+                if (orderMobile.getPayTime() != null) {
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(new Date());
+                    calendar.set(Calendar.HOUR_OF_DAY, 0);
+                    calendar.set(Calendar.MINUTE, 0);
+                    calendar.set(Calendar.SECOND, 0);
+                    Date now = calendar.getTime();
+                    Date payDate = DateFormatUtils.formatDate(orderMobile.getPayTime(), "yyyy-MM-dd");
+                    long difference =  (now.getTime()-payDate.getTime())/86400000;
+                    orderMobile.setIsSevenDay(String.valueOf(Math.abs(difference)));
+                }
+
                 if (orderMobile.getId() != null) {
                     List<ProductMobile> mobiles = orderMapper.orderDetill(orderMobile.getId());
                     orderMobile.setProductMobile(mobiles);

aidea-modules/order-module/src/main/java/com/cftech/order/utils/InvoiceUtil.java

@@ -75,10 +75,10 @@ public class InvoiceUtil {
             order.put("buyerTaxNum", unitTax);
         }
         //购方电话  非必传
-        order.put("buyerTel", StringUtils.isNoneBlank(orderObj.getMemberPhone()) ? "": //
+        order.put("buyerTel", StringUtils.isBlank(orderObj.getMemberPhone()) ? "": //
                 orderObj.getMemberPhone().substring(0,3) + "****" + orderObj.getMemberPhone().substring(7, orderObj.getMemberPhone().length()));
         //购方地址  非必填
-        order.put("buyerAddress",  StringUtils.isNoneBlank(orderObj.getAddressDes()) ? "": //
+        order.put("buyerAddress",  StringUtils.isBlank(orderObj.getAddressDes()) ? "": //
                 orderObj.getAddressDes().substring(0,3) + "****" + orderObj.getAddressDes().substring(7, orderObj.getAddressDes().length()));
         //购方银行账号及开户行地址  非必填
         order.put("buyerAccount", "");
@@ -186,7 +186,7 @@ public class InvoiceUtil {
         JSONObject total = new JSONObject();
         total.put("order", order);
         String result = sdk.sendPostSyncRequest(url, senId, appKey, appSecret, token, taxNum, method, total.toString());
-        log.error(result);
+        log.info(result);
         return result;
     }