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

Merge Request: 提交

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

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

@@ -57,6 +57,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.security.Signature;
+import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -1887,6 +1888,7 @@ public class HouseOrderController implements HouseOrderAPI {
                     payRecord.setIsSuccess(2);
                     payRecord.setRemark(transaction.getTradeStateDesc());
                     one.setOrderStatus("3");
+                    one.setPayTime(transaction.getSuccessTime());
                     break;
                 case PAYERROR:
                     payRecord.setRemark(transaction.getTradeStateDesc());
@@ -1992,6 +1994,7 @@ public class HouseOrderController implements HouseOrderAPI {
                     payRecord.setIsSuccess(2);
                     payRecord.setRemark(transaction.getTradeStateDesc());
                     one.setOrderStatus("3");
+                    one.setPayTime(transaction.getSuccessTime());
                     break;
                 case PAYERROR:
                     payRecord.setRemark(transaction.getTradeStateDesc());
@@ -2666,6 +2669,7 @@ public class HouseOrderController implements HouseOrderAPI {
                 }
             }
             one.setOrderStatus("2");
+            one.setPayTime(TimeExchange.getTime());
             boolean oneFlag = houseOrderService.updateById(one);
             if (!oneFlag) {
                 return CommonResult.fail("订单现金支付失败");