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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinStationUploadParam.java

@@ -13,4 +13,5 @@ public class KylinStationUploadParam implements Serializable {
     private static final long serialVersionUID = -44725043769303036L;
     @ApiModelProperty(position = 10, value = "票明细数据")
     List<KylinStationCheckOrderParam> checkOrderParamList;
+    String checkClient;
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderRefundEntitiesVo.java

+package com.liquidnet.service.kylin.dto.vo.mongo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@ApiModel
+@Data
+public class KylinOrderRefundEntitiesVo {
+    private Integer mid;
+    private String orderRefundsEntities_id;
+    private String orderRefundsId;
+    private String orderTicketEntitiesId;
+    private BigDecimal refundPrice;
+    private LocalDateTime created_at;
+    private LocalDateTime updated_at;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderRefundsVo.java

+package com.liquidnet.service.kylin.dto.vo.mongo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class KylinOrderRefundsVo {
+    private Integer mid;
+    private String order_refunds_id;
+    private String order_tickets_id;
+    private String order_refund_code;
+    private String order_refund_batches_id;
+    private String refund_code;
+    private LocalDateTime refund_at;
+    private String refund_id;
+    private String refund_error;
+    private BigDecimal price;
+    private BigDecimal price_express;
+    private Integer status;
+    private Integer type;
+    private String applicant_id;
+    private String applicant_name;
+    private LocalDateTime applicant_at;
+    private String reason;
+    private String auditor_id;
+    private String auditor_name;
+    private LocalDateTime auditor_at;
+    private String reject;
+    private String executor_id;
+    private String executor_name;
+    private LocalDateTime executor_at;
+    private String refuse;
+    private Integer refund_type;
+    private String refund_cate;
+    private LocalDateTime created_at;
+    private LocalDateTime updated_at;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketEntitiesService.java

 package com.liquidnet.service.kylin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.service.kylin.dto.param.KylinStationCheckOrderParam;
+import com.liquidnet.service.kylin.dto.param.KylinStationUploadParam;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 
-import java.util.List;
-
 /**
  * <p>
  * 订单详情 服务类
@@ -16,5 +14,5 @@ import java.util.List;
  */
 public interface IKylinOrderTicketEntitiesService extends IService<KylinOrderTicketEntities> {
 
-    void updateByStation(List<KylinStationCheckOrderParam> checkOrderParamList);
+    void updateByStation(KylinStationUploadParam parameter);
 }

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -31,7 +31,7 @@ liquidnet:
 #    port: 6380
 #    password: PO@B!Iud32
   mongodb:
-    host: s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
+    host: s-2zef656730e5a1d4-pub.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14-pub.mongodb.rds.aliyuncs.com:3717
     port: 3717
     user: root
     pwd: $hAh4SGcDQ

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/DataMigrationProcessorService.java

@@ -17,16 +17,16 @@ public abstract class DataMigrationProcessorService {
     }
     public static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
 //    public static final String DB_URL = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/";
-//    public static final String DB_URL = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/";
-//    public static final String DB_USER = "readonly";
-//    public static final String DB_PWD = "ZWDsf8Fy";
-//    public static final String DB_NAME_PASSPORT = "passport";
+    public static final String DB_URL = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/";
+    public static final String DB_USER = "readonly";
+    public static final String DB_PWD = "ZWDsf8Fy";
+    public static final String DB_NAME_PASSPORT = "passport";
     public static final String DB_NAME_MALL = "mall";
 
-    public static final String DB_URL = "jdbc:mysql://39.106.122.201:3308/";
-    public static final String DB_USER = "testmall";
-    public static final String DB_PWD = "zhengzai!mYT";
-    public static final String DB_NAME_PASSPORT = "testmall";
+//    public static final String DB_URL = "jdbc:mysql://39.106.122.201:3308/";
+//    public static final String DB_USER = "testmall";
+//    public static final String DB_PWD = "zhengzai!mYT";
+//    public static final String DB_NAME_PASSPORT = "devpassport";
 
     @Autowired
     public MongoTemplate mongoTemplate;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -415,7 +415,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
         s = System.currentTimeMillis();
         rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UMEMBER,
-                SqlMapping.gets(toMqSqls, updateMemberCodeObjs, initMemberOrderObjs, upsertUserMemberObjs));
+                SqlMapping.gets(toMqSqls, upsertUserMemberObjs, updateMemberCodeObjs, initMemberOrderObjs));
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
 
         AdamMemberOrderResult result = AdamMemberOrderResult.getNew();

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

@@ -34,8 +34,8 @@ import org.springframework.util.DigestUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.spring.web.json.Json;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import java.math.BigDecimal;
@@ -363,9 +363,21 @@ public class KylinStationController {
     public ResponseDto<Object> uploadTicketData(@RequestBody KylinStationUploadParam parameter) {
         log.debug("checkDataParams:{}", JsonUtils.toJson(parameter));
 
+        HttpServletRequest request = ServletUtils.getRequest();
+        String agent = request.getParameter("User-Agent");
+        if (StringUtils.containsIgnoreCase(agent, "android")) {
+            parameter.setCheckClient("ANDROID");
+        } else if (StringUtils.containsIgnoreCase(agent, "iPhone")
+                || StringUtils.containsIgnoreCase(agent, "iPod")
+                || StringUtils.containsIgnoreCase(agent, "iPad")) {
+            parameter.setCheckClient("IOS");
+        } else {
+            parameter.setCheckClient("APP");
+        }
+
         List<KylinStationCheckOrderParam> checkOrderParamList = parameter.getCheckOrderParamList();
         if (!CollectionUtils.isEmpty(checkOrderParamList)) {
-            kylinOrderTicketEntitiesService.updateByStation(checkOrderParamList);
+            kylinOrderTicketEntitiesService.updateByStation(parameter);
         }
 
         return ResponseDto.success();

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

@@ -5,12 +5,11 @@ import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.SqlMapping;
-import com.liquidnet.service.kylin.dto.param.KylinStationCheckOrderParam;
+import com.liquidnet.service.kylin.dto.param.KylinStationUploadParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketEntitiesService;
-import com.liquidnet.service.kylin.utils.DataUtils;
 import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.model.UpdateOneModel;
 import com.mongodb.client.model.WriteModel;
@@ -19,12 +18,9 @@ import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -42,18 +38,14 @@ import java.util.List;
 @Slf4j
 @Service
 public class KylinOrderTicketEntitiesServiceImpl extends ServiceImpl<KylinOrderTicketEntitiesMapper, KylinOrderTicketEntities> implements IKylinOrderTicketEntitiesService {
-    @Autowired
-    MongoConverter mongoConverter;
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
     RabbitTemplate rabbitTemplate;
-    @Autowired
-    DataUtils dataUtils;
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public void updateByStation(List<KylinStationCheckOrderParam> checkOrderParamList) {
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+    public void updateByStation(KylinStationUploadParam parameter) {
 //        // 根据验票用户ID分组
 //        Map<String, List<KylinStationCheckOrderParam>> checkOrderByUserIdMap = checkOrderParamList.stream().collect(Collectors.groupingBy(KylinStationCheckOrderParam::getCheckUserId));
 //
@@ -68,19 +60,24 @@ public class KylinOrderTicketEntitiesServiceImpl extends ServiceImpl<KylinOrderT
         String nowDtStr = DateUtil.format(nowDt, DateUtil.Formatter.yyyyMMddHHmmss);
         LinkedList<Object[]> paramsList = new LinkedList<>();
         List<WriteModel<Document>> list = new ArrayList<>();
-        checkOrderParamList.forEach(r -> {
+        parameter.getCheckOrderParamList().forEach(r -> {
             KylinOrderTicketEntitiesVo updateVo = KylinOrderTicketEntitiesVo.getNew();
+            updateVo.setStatus(1);// 出票状态: 0未出票 1已出票
+            updateVo.setCheckClient(parameter.getCheckClient());
+            updateVo.setUpdatedAt(nowDtStr);
             updateVo.setCheckType(r.getCheckType());
             updateVo.setCheckedAt(r.getCheckedAt());
             updateVo.setCheckUserId(r.getCheckUserId());
-            updateVo.setUpdatedAt(nowDtStr);
-            updateVo.setStatus(1);
-
-//            dataUtils.delOrderTicketEntitiesRedis(r.getTicketEntitiesId());
 
-            paramsList.add(new Object[]{1, nowDtStr, r.getCheckedAt(), r.getCheckType(), r.getCheckUserId(), r.getTicketEntitiesId()});
+            paramsList.add(new Object[]{1, updateVo.getCheckClient() + updateVo.getCheckType(), nowDt, r.getTicketEntitiesId()});
             Document updateQuery = Query.query(Criteria.where("orderTicketEntitiesId").is(r.getTicketEntitiesId())).getQueryObject();
-            list.add(new UpdateOneModel<Document>(updateQuery, new Document("$set", Document.parse(JsonUtils.toJson(updateVo)))));
+            Document updateDoc = new Document("status", updateVo.getStatus())
+                    .append("checkClient", updateVo.getCheckClient())
+                    .append("updatedAt", updateVo.getUpdatedAt())
+                    .append("checkType", updateVo.getCheckType())
+                    .append("checkedAt", updateVo.getCheckedAt())
+                    .append("checkUserId", updateVo.getUserId());
+            list.add(new UpdateOneModel<Document>(updateQuery, new Document("$set", updateDoc)));
         });
         BulkWriteResult bulkWriteResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).bulkWrite(list);
         log.info("bulkWriteResult:{}", JsonUtils.toJson(bulkWriteResult));

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

-kylin_order_ticket_entities.updateStatusByStation=UPDATE kylin_order_ticket_status SET `status`=?, updated_at=?, checked_at=?, check_type=?, checkUserId=? WHERE order_ticket_entities_id =? 
+kylin_order_ticket_entities.updateStatusByStation=UPDATE kylin_order_ticket_entities SET `status`=?,check_client=?,updated_at=? WHERE order_ticket_entities_id=? 
 
 # ------------------------缺票登记(不用考虑并发)----------------------------
 kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id` ,`performance_id` ,`ticket_id` ,`user_id` ,`user_name` ,`user_mobile` ,`send_status` ,`ip_address` ,`created_at`)VALUES(? ,? ,? ,? ,? ,? ,? ,? ,?);