Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -9,7 +9,6 @@ import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceOrderListAdm
 import com.liquidnet.service.kylin.dto.param.PerformanceExpressSearchAdminParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
@@ -31,16 +30,18 @@ public class PerformancesExpressController extends BaseController {
 
     private String prefix = "zhengzai/kylin/performancesExpress";
 
-    @Value("${liquidnet.shunfeng.url}")
-    private String url;
+    /*@Value("${liquidnet.shunfeng.url}")
+    public String url;
     @Value("${liquidnet.shunfeng.sk}")
     private String sk;
     @Value("${liquidnet.shunfeng.appid}")
-    private String appid;
+    private String appid;*/
 
     @Autowired
     private PerformancesExpressServiceImpl performancesExpressServiceImpl;
 
+    private ShunfengSignUtils shunfengSignUtils;
+
     /**
      * 查询演出列表
      */
@@ -90,7 +91,7 @@ public class PerformancesExpressController extends BaseController {
         System.out.println("时间戳:"+currentTimeMillis);
 
         // 生成签名并请求
-        String result = ShunfengSignUtils.generateSignatureAndRequest(currentTimeMillis + "", body);
+        String result = shunfengSignUtils.generateSignatureAndRequest(currentTimeMillis + "", body, "/order/v1/placeOrder");
         System.out.println("响应:"+result);
         return true;
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/ShunfengSignUtils.java

@@ -28,12 +28,17 @@ public class ShunfengSignUtils {
      * appId
      */
     @Value("${liquidnet.shunfeng.appid}")
-    private static String APP_ID = "";
+    private String APP_ID;
     /**
      * sk
      */
     @Value("${liquidnet.shunfeng.sk}")
-    private static String SK = "";
+    private String SK;
+    /**
+     * url
+     */
+    @Value("${liquidnet.shunfeng.url}")
+    private String URL;
     /**
      * 签名有效期（可根据实际业务设定）单位：毫秒
      */
@@ -45,14 +50,15 @@ public class ShunfengSignUtils {
      * @param body 请求body
      * @return
      */
-    public static String generateSignatureAndRequest(String timestamp, String body) {
+    public String generateSignatureAndRequest(String timestamp, String body, String url) {
         // 生成签名
         String sign = genSign(timestamp,body);
         System.out.println("签名:"+sign);
 
         CloseableHttpClient client = HttpClients.createDefault();
         // 请求下单地址
-        HttpPost httpPost = new HttpPost("https://butler-dev-ms.sf-express.com/public/order/v1/placeOrder");
+        HttpPost httpPost = new HttpPost(URL + url);
+        System.out.println("请求的url:"+URL + url);
         // sendAppId（sendAppId需赋值appId）
         httpPost.addHeader("sendAppId", APP_ID);
         // 时间戳需和获取验签时一致！！！
@@ -99,7 +105,7 @@ public class ShunfengSignUtils {
      * @param body 请求body
      * @return
      */
-    private static String genSign(String timestamp, String body) {
+    private String genSign(String timestamp, String body) {
         if (StringUtils.isEmpty(body)) {
             body = "";
         }
@@ -121,7 +127,7 @@ public class ShunfengSignUtils {
      * @param request 接收请求
      * @return
      */
-    public static boolean receiveRequestAndCheckSign(String params, HttpServletRequest request) {
+    public boolean receiveRequestAndCheckSign(String params, HttpServletRequest request) {
         // 请求方APPID
         String sendAppId = request.getHeader("sendAppId");
         // 请求方时间戳
@@ -148,7 +154,7 @@ public class ShunfengSignUtils {
             return false;
         }
         // 请求方参数+请求方时间戳+SK 生成签名
-        String thisSign = ShunfengSignUtils.genSign(timestamp, params);
+        String thisSign = genSign(timestamp, params);
         // 获取的签名和请求方签名比较是否一致
         if (!thisSign.equals(sign)) {
             System.out.println("签名错误");

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -214,7 +214,7 @@ public class KylinOrderTickets implements Serializable {
      */
     public Object[] getPayAgainObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                 updatedAt, orderCode, orderTicketsId,updateTime,createTime
+                 updatedAt, payCode, orderTicketsId,updateTime,createTime
         };
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -724,8 +724,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain"));
                 LinkedList<Object[]> sqlsDataC = new LinkedList<>();
                 sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
+                sqls.add(SqlMapping.get("kylin_order_ticket_entities.payAgain"));
+                LinkedList<Object[]> sqlsDataD = new LinkedList<>();
+                sqlsDataD.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
 
-                String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC);
+                String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC,sqlsDataD);
                 rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_AGAIN, MQConst.ROUTING_KEY_SQL_ORDER_AGAIN, sqlData);
                 log.info(UserPathDto.setData("再次支付", payAgainParam, payResultVo));
                 return ResponseDto.success(payResultVo);
@@ -972,10 +975,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketVo.setFieldName(performanceVo.getFieldName());
                 if (ticketVo.getIsShowCode() == 1) {
                     Date date = DateUtil.parse(ticketVo.getQrCodeShowTime(), DateUtil.Formatter.yyyyMMddHHmm.toString());
-                    if (DateUtil.compareDay(date, DateUtil.now()) <= 0) {
-                        orderTicketVo.setQrCode("");
-                    } else {
+                    if (DateUtil.compareDay(DateUtil.now(),date ) >= 0) {
                         orderTicketVo.setQrCode(orderTicketVo.getQrCode());
+                    } else {
+                        orderTicketVo.setQrCode("");
                     }
                 } else {
                     orderTicketVo.setQrCode("");

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

@@ -10,9 +10,11 @@ kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , order_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+
 
 
 # ------------------------支付回调----------------------------