Accept Merge Request #16: (develop-wxl -> master)

Merge Request: 提交

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/16?initial=true

src/main/java/com/template/common/utils/TimeExchange.java

@@ -648,10 +648,35 @@ public class TimeExchange {
         // 1=星期日 7=星期六，其他类推
         return new SimpleDateFormat("EEEE").format(c.getTime());
     }
+    //utc转string
+    public static String utcToString(String utcStr) throws ParseException {
+        // 再转换为时间
+        Date date = new Date();
+        // 注意format的格式要与日期String的格式相匹配
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        try {
+            date = dateFormat.parse(utcStr);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        DateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String dateStr = dateFormat2.format(date);
+        return dateStr;
+    }
 
     public static void main(String[] args) throws ParseException {
-        BigDecimal ss = new BigDecimal(0.3).divide(new BigDecimal(3),2);//.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-        System.out.println("");
+        Date date = new Date();
+        // 注意format的格式要与日期String的格式相匹配
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        try {
+            date = dateFormat.parse("2024-08-08T10:09:48+08:00");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        DateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String dateStr = dateFormat2.format(date);
+        System.out.println(dateStr);
+
     }
 }
 

src/main/java/com/template/controller/HouseOrderController.java

@@ -1811,7 +1811,7 @@ public class HouseOrderController implements HouseOrderAPI {
         PrepayRequest requestpay = new PrepayRequest();
         requestpay.setAppid(wxPayV3Config.getAppId());
         requestpay.setMchid(wxPayV3Config.getMchId());
-        requestpay.setDescription("智慧公寓");
+        requestpay.setDescription("研究生公寓");
         Amount amount2 = new Amount();
         amount2.setTotal(totalfee);
         requestpay.setNotifyUrl(wxPayV3Config.getDomain() + "/auto/house-order/returnPay");
@@ -1892,7 +1892,7 @@ public class HouseOrderController implements HouseOrderAPI {
                     payRecord.setIsSuccess(2);
                     payRecord.setRemark(transaction.getTradeStateDesc());
                     one.setOrderStatus("3");
-                    one.setPayTime(transaction.getSuccessTime());
+                    one.setPayTime(TimeExchange.utcToString(transaction.getSuccessTime()));
                     break;
                 case PAYERROR:
                     payRecord.setRemark(transaction.getTradeStateDesc());
@@ -1998,7 +1998,7 @@ public class HouseOrderController implements HouseOrderAPI {
                     payRecord.setIsSuccess(2);
                     payRecord.setRemark(transaction.getTradeStateDesc());
                     one.setOrderStatus("3");
-                    one.setPayTime(transaction.getSuccessTime());
+                    one.setPayTime(TimeExchange.utcToString(transaction.getSuccessTime()));
                     break;
                 case PAYERROR:
                     payRecord.setRemark(transaction.getTradeStateDesc());
@@ -2718,7 +2718,7 @@ public class HouseOrderController implements HouseOrderAPI {
         com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
         request.setAppid(wxPayV3Config.getAppId());
         request.setMchid(wxPayV3Config.getMchId());
-        request.setDescription("测试商品标题");
+        request.setDescription("研究生公寓");
         amount.setTotal((int) (price * 100));
         request.setAmount(amount);
         request.setOutTradeNo(payRecord.getPayNo());