Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -16,6 +16,7 @@ public class AdamRedisConst {
     public static final String INFO_THIRD_PARTY = INFO.concat("third_party:");
     public static final String INFO_ENTERS = INFO.concat("enters:");
     public static final String INFO_ADDRESSES = INFO.concat("addresses:");
+    public static final String INFO_CERTIFICATION = INFO.concat("certification:");
 
     public static final String INFO_MEMBER_SIMPLE = INFO.concat("member:simple");
     public static final String INFO_MEMBER_CATEGORY = INFO.concat("member:category:");

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRdmService.java

@@ -28,7 +28,9 @@ public interface IAdamRdmService {
 
     AdamRealInfoVo getRealInfoVoByUid(String uid);
 
-    void delRealInfoVoByUid(String uid);
+    boolean setCertification(int idType, String idNo, String idName);
+
+    boolean isCertification(int idType, String idNo, String idName);
 
     boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList);
 

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

@@ -184,7 +184,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
-    // 主动完成退款
+    // 主动完成退款 没有批量
     @RequiresPermissions("kylin:refund:completed")
     @PostMapping("completed")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html

@@ -104,7 +104,7 @@
         <div class="form-group">
             <label class="font-noraml">请上传封面图</label>
             <div class="file-loading">
-                <input id="fileinput-demo-1" type="file" name="coverImgFile">
+                <input id="fileinput-demo-1" type="file" name="coverImgFile" data-browse-on-zone-click="true" data-msg-placeholder="Select {files} for upload...">
             </div>
         </div>
         <input hidden id="coverImg" name="coverImg">
@@ -356,8 +356,11 @@
         $("#fileinput-demo-1").fileinput({
             'theme': 'explorer-fas',
             'uploadUrl': "/kylin/banners/upload3",
-            overwriteInitial: false,
-            initialPreviewAsData: true,
+            // overwriteInitial: false,
+            // initialPreviewAsData: true,
+            autoReplace: true,
+            dropZoneTitle: "请上传文件",
+            maxFileCount: 1
         });
         $("#fileinput-demo-1").on("fileuploaded", function(event, data, previewId, index) {
             $("#coverImg").val(data.response.uploadpath)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/refund.html

@@ -94,6 +94,7 @@
     var executeFlag = [[${@permission.hasPermi('kylin:refund:execute')}]];
     var cancelFlag = [[${@permission.hasPermi('kylin:refund:cancel')}]];
     var reapplyFlag = [[${@permission.hasPermi('kylin:refund:reapply')}]];
+    var completedFlag = [[${@permission.hasPermi('kylin:refund:completed')}]];
 
     var prefix = ctx + "kylin/refund";
 
@@ -189,6 +190,7 @@
             detailUrl: prefix + "/details/{id}",
             cancelUrl: prefix + "/cancel",
             reapplyUrl: prefix + "/reapply",
+            completedUrl: prefix + "/completed",
             modalName: "-订单退款",
             columns: [{
                 checkbox: true
@@ -236,6 +238,7 @@
                         actions.push('<a class="btn btn-primary btn-xs ' + executeFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>二审</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定取消退款申请吗？\', table.options.cancelUrl)"></i>取消</a> ');
                         actions.push('<a class="btn btn-warning btn-xs ' + reapplyFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定重新提交退款审核吗？\', table.options.reapplyUrl)"></i>重新提交</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + completedFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderRefundsId + '\', \'确定主动完成退款吗？\', table.options.completedUrl)"></i>主动完成退款</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -7,6 +7,7 @@ import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.MongoVoUtils;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -20,11 +21,13 @@ import com.liquidnet.service.kylin.mapper.*;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 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;
@@ -33,6 +36,7 @@ import org.springframework.util.MultiValueMap;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -74,6 +78,9 @@ public class KylinRefundsStatusServiceImpl {
     @Autowired
     MongoTemplate mongoTemplate;
 
+    @Autowired
+    private MongoConverter mongoConverter;
+
     @Autowired
     private DataUtils dataUtils;
 
@@ -409,14 +416,12 @@ public class KylinRefundsStatusServiceImpl {
         double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
         int refundNumber = 0;
         for (String entitiesId : orderTicketEntitiesIdsArr) {
-            Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundOverEntitiesPrice(//已退完成的
-                    orderTicketsId,
-                    KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED,
-                    entitiesId
+            KylinOrderTicketEntities EntitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(//已退完成的
+                    new QueryWrapper<KylinOrderTicketEntities>()
+                            .eq("order_ticket_entities_id", entitiesId)
             );
-            if (null == refundedPrice) {
-                refundedPrice = 0.0;
-            }
+            BigDecimal refundedPrice = EntitiesInfo.getRefundPrice();
+
             KylinOrderRefundEntities refundEntitiesInfo = kylinOrderRefundsEntitiesMapper.selectOne(
                     new QueryWrapper<KylinOrderRefundEntities>()
                             .eq("order_refunds_id", refundInfo.getOrderRefundsId())
@@ -425,32 +430,30 @@ public class KylinRefundsStatusServiceImpl {
 
             KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
             double priceNew = refundEntitiesInfo.getRefundPrice().doubleValue() + refundedPrice.doubleValue();
+            int isPayment = 0;
             if (priceNew == onePrice) {
-                entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
-                refundNumber ++;
+                isPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT3;
+                refundNumber++;
             } else {
-                entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT4);
+                isPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT4;
             }
+            entitiesTable.setIsPayment(isPayment);
             entitiesTable.setUpdatedAt(LocalDateTime.now());
             entitiesTable.setRefundPrice(BigDecimal.valueOf(priceNew));
+            Integer[] entitiesTableIsPayment = {KylinTableStatusConst.ENTITIES_IS_PAYMENT2, KylinTableStatusConst.ENTITIES_IS_PAYMENT4};
             kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
                     .eq("order_ticket_entities_id", entitiesId)
-                    .eq("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT2)
+                    .in("is_payment", entitiesTableIsPayment)
             );
 
-            KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = new KylinOrderTicketEntitiesVo();
-            if (priceNew == onePrice) {
-                kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT3);
-            } else {
-                kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT4);
-            }
-            kylinOrderTicketEntitiesVo.setUpdatedAt(LocalDateTime.now().toString());
-            kylinOrderTicketEntitiesVo.setRefundPrice(BigDecimal.valueOf(priceNew));
-            BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
-            Document entitiesDoc = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).findOneAndUpdate(
+            HashMap<String, Object> EntitiesVo = new HashMap<>();
+            EntitiesVo.put("updatedAt", DateUtil.getNowTime());
+            EntitiesVo.put("refundPrice", BigDecimal.valueOf(priceNew));
+            EntitiesVo.put("isPayment", isPayment);
+            BasicDBObject EntitiesVov = new BasicDBObject("$set", mongoConverter.convertToMongoType(EntitiesVo));
+            UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("orderTicketEntitiesId").is(entitiesId)).getQueryObject(),
-                    entitiesObject,
-                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                    EntitiesVov
             );
 
             dataUtils.delOrderTicketEntitiesRedis(entitiesId);
@@ -468,17 +471,15 @@ public class KylinRefundsStatusServiceImpl {
                         .eq("order_tickets_id", orderTicketsId)
         );
 
-        KylinOrderTicketVo kylinOrderTicketVoOrder = new KylinOrderTicketVo();
-        kylinOrderTicketVoOrder.setStatus(newStatus);
-        kylinOrderTicketVoOrder.setRefundNumber(num);
-        kylinOrderTicketVoOrder.setUpdatedAt(LocalDateTime.now().toString());
-        // TODO: 2021/6/16  error
-        // kylinOrderTicketVoOrder.setPriceRefund(BigDecimal.valueOf(price));
-        BasicDBObject orderEntitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVoOrder)));
-        Document docOrder = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
+        HashMap<String, Object> orderVo = new HashMap<>();
+        orderVo.put("updatedAt", DateUtil.getNowTime());
+        orderVo.put("priceRefund", BigDecimal.valueOf(price));
+        orderVo.put("status", newStatus);
+        orderVo.put("refundNumber", num);
+        BasicDBObject orderVov = new BasicDBObject("$set", mongoConverter.convertToMongoType(orderVo));
+        UpdateResult orderUpdateResult = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
-                orderEntitiesObject,
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                orderVov
         );
         dataUtils.delOrderTicketRedis(orderTicketsId);
         mongoVoUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderTicketsId,null);
@@ -490,7 +491,6 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
         kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
         kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
-        kylinOrderRefunds.setRefundError(refundCallbackParam.getRefund_error());
         kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
         kylinOrderRefundsMapper.update(
                 kylinOrderRefunds,

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

@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.result.DeleteResult;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -184,13 +185,10 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
 //        removeVo.setDeletedAt(now);
 
         long s = System.currentTimeMillis();
-        Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
-                Query.query(Criteria.where("addressesId").is(addressesId)).getQueryObject(),
-                new Document("$set", new Document("state", 2).append("isDefault", false).append("updatedAt", now).append("deletedAt", now)),
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+        DeleteResult deleteResult = mongoTemplate.remove(
+                Query.query(Criteria.where("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName()
         );
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-        if (null != doc) {
         List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
         vos.removeIf(r -> r.getAddressesId().equals(addressesId));
         s = System.currentTimeMillis();
@@ -203,7 +201,6 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         );
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
     }
-    }
 
     @Override
     public AdamAddressesVo queryDefault(String uid) {

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

@@ -11,6 +11,7 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import com.mongodb.client.result.DeleteResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.Document;
@@ -19,12 +20,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 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 org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 
@@ -65,26 +63,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
 
         if (1 == parameter.getType()) {
-            LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
-            paramsMap.add("realName", parameter.getName());
-            paramsMap.add("cardNo", parameter.getIdCard());
-
-            String respStr = null;
-            try {
-                long s = System.currentTimeMillis();
-                respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
-                log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
-                log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
-                Map respMap = JsonUtils.fromJson(respStr, Map.class);
-                if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
-                    log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", currentUid, parameter.getName(), parameter.getIdCard(), respStr);
-                    ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-                    throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-                }
-            } catch (Exception e) {
-                log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", currentUid, parameter.getName(), parameter.getIdCard(), respStr, e);
-                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
+                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
             }
         }
 
@@ -105,6 +85,9 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
         s = System.currentTimeMillis();
         adamRdmService.delEntersVoByUid(currentUid);
+        if (1 == parameter.getType()) {
+            adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
+        }
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
         s = System.currentTimeMillis();
@@ -178,9 +161,18 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void edit(AdamEntersParam parameter) {
         LocalDateTime now = LocalDateTime.now();
+        String currentUid = CurrentUtil.getCurrentUid();
+
+
+        if (1 == parameter.getType()) {
+            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
+                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
+            }
+        }
+
 
         AdamEntersVo updateVo = AdamEntersVo.getNew();
         BeanUtils.copyProperties(parameter, updateVo);
@@ -194,10 +186,12 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         if (null != doc) {
             updateVo = BsonUtil.toBean(doc, AdamEntersVo.class);
 
-            String currentUid = CurrentUtil.getCurrentUid();
             List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
             s = System.currentTimeMillis();
             adamRdmService.setEntersVoByUid(currentUid, this.collectionProcess(vos, parameter.getEntersId(), updateVo));
+            if (1 == parameter.getType()) {
+                adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
+            }
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
             s = System.currentTimeMillis();
@@ -211,24 +205,14 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void remove(String uid, String entersId) {
         LocalDateTime now = LocalDateTime.now();
-
-//        AdamEntersVo removeVo = AdamEntersVo.getNew();
-//        removeVo.setState(2);
-//        removeVo.setIsDefault(false);
-//        removeVo.setUpdatedAt(now);
-//        removeVo.setDeletedAt(now);
-
         long s = System.currentTimeMillis();
-        Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
-                Query.query(Criteria.where("entersId").is(entersId)).getQueryObject(),
-                new Document("$set", new Document("state", 2).append("isDefault", false).append("updatedAt", now).append("deletedAt", now)),
-                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+        DeleteResult deleteResult = mongoTemplate.remove(
+                Query.query(Criteria.where("entersId").is(entersId)), AdamEntersVo.class.getSimpleName()
         );
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-        if (null != doc) {
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
         vos.removeIf(r -> r.getEntersId().equals(entersId));
         s = System.currentTimeMillis();
@@ -241,7 +225,6 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         );
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
     }
-    }
 
     @Override
     public AdamEntersVo queryDefault(String uid) {
@@ -286,4 +269,28 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         log.debug("#collect.process耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
+
+    private void identityHandler(String currentUid, String name, String idCard) {
+        String respStr = null;
+        try {
+            LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+            paramsMap.add("realName", name);
+            paramsMap.add("cardNo", idCard);
+
+            long s = System.currentTimeMillis();
+            respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
+            log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
+            log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
+            Map respMap = JsonUtils.fromJson(respStr, Map.class);
+            if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
+                log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", currentUid, name, idCard, respStr);
+                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            }
+        } catch (Exception e) {
+            log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", currentUid, name, idCard, respStr, e);
+            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+        }
+    }
 }

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

@@ -143,8 +143,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public void delRealInfoVoByUid(String uid) {
-        redisUtil.del(AdamRedisConst.INFO_REAL_NAME.concat(uid));
+    public boolean setCertification(int idType, String idNo, String idName) {
+        return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION + idType + idNo, idName);
+    }
+
+    @Override
+    public boolean isCertification(int idType, String idNo, String idName) {
+        String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION + idType + idNo);
+        return !StringUtils.isEmpty(o) && o.equals(idName);
     }
 
     @Override

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

@@ -366,12 +366,12 @@ public class AdamUserServiceImpl implements IAdamUserService {
         if (RedisLockUtil.tryLock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid, 1, 3)) {
             vo = adamRdmService.getRealInfoVoByUid(uid);
             if (null == vo) {
+                if (!adamRdmService.isCertification(1, idCard, name)) {
+                    String respStr = null;
+                    try {
                         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
                         paramsMap.add("realName", name);
                         paramsMap.add("cardNo", idCard);
-
-                String respStr = null;
-                try {
                         long s = System.currentTimeMillis();
                         respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
                         log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
@@ -387,6 +387,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                         ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
                         throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
                     }
+                }
 
                 AdamRealName realName = new AdamRealName();
                 realName.setRealNameId(IDGenerator.nextSnowId() + "");
@@ -407,6 +408,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
                 long s = System.currentTimeMillis();
                 adamRdmService.setRealInfoVoByUid(uid, vo);
+                adamRdmService.setCertification(1, idCard, name);
                 log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
             }
             RedisLockUtil.unlock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid);

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

@@ -29,6 +29,7 @@ import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
+import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.kylin.utils.*;
@@ -104,6 +105,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     private TaobaoTicketUtils taobaoTicketUtils;
     @Autowired
     private KylinOrderTicketsMapper orderTicketsMapper;
+    @Autowired
+    private OrderRefundsCallbackServiceImpl orderRefundsCallbackService;
 
     ArrayList<Integer> canBuyStatus = new ArrayList() {{
         add(6);
@@ -367,11 +370,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             orderTickets.setPriceTotal(ticketData.getPrice().multiply(new BigDecimal(payOrderParam.getNumber())).add(payOrderParam.getIsExpress() == 1 ? ticketData.getPriceExpress() : new BigDecimal("0")));
         }
 
-        /*if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
+        if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
             orderTickets.setPriceActual(new BigDecimal("0.01"));
-        } else {*/
+        } else {
             orderTickets.setPriceActual(orderTickets.getPriceTotal());
-//        }
+        }
 
         orderTickets.setPriceVoucher(new BigDecimal("0.0"));
         orderTickets.setPriceExpress(ticketData.getPriceExpress());
@@ -536,11 +539,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
         LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<String, String>();
         httpData.add("type", "TICKET");
-        /*if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
+        if (Arrays.asList("dev", "test").contains(environment.getProperty("spring.profiles.active"))) {
             httpData.add("price", "0.01");
-        } else {*/
+        } else {
             httpData.add("price", orderTickets.getPriceActual().toString());
-//        }
+        }
         httpData.add("name", useTime + ticketData.getTitle() + "-" + performanceData.getTitle());
         httpData.add("detail", performanceData.getTitle() + "-" + ticketData.getTitle() + "-" + useTime);
         httpData.add("order_code", orderTickets.getOrderCode());
@@ -779,10 +782,18 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         }
 
         LinkedList<String> sqls = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataA = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataB = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataC = new LinkedList<>();
+        LinkedList<Object[]> sqlsDataD = new LinkedList<>();
+
         LocalDateTime strTime = orderTicketData.getChangeDate();
 
-        //sql
         KylinOrderTickets orderTickets = new KylinOrderTickets();
+        KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
+        KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
+
+        if(orderTicketData.getStatus()==0){
             orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
             orderTickets.setPaymentType(syncOrderParam.getPayment_type());
             orderTickets.setPayCode(syncOrderParam.getCode());
@@ -790,31 +801,24 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             orderTickets.setQrCode(IDGenerator.ticketQrCode(orderTicketData.getOrderTicketsId()));
             orderTickets.setUpdatedAt(now);
             sqls.add(SqlMapping.get("kylin_order_ticket.synPay"));
-        LinkedList<Object[]> sqlsDataA = new LinkedList<>();
             sqlsDataA.add(orderTickets.getSynOrderObject(strTime, strTime));
 
-        KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
             orderTicketStatus.setOrderId(orderTicketData.getOrderTicketsId());
             orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS1);
             orderTicketStatus.setPayStatus(syncOrderParam.getStatus());
             orderTicketStatus.setUpdatedAt(orderTickets.getUpdatedAt());
             sqls.add(SqlMapping.get("kylin_order_ticket_status.synPay"));
-        LinkedList<Object[]> sqlsDataB = new LinkedList<>();
             sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime));
 
             sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
-        LinkedList<Object[]> sqlsDataC = new LinkedList<>();
             sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
 
-        KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
             orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId());
             orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
             orderTicketEntities.setUpdatedAt(orderTickets.getUpdatedAt());
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.synPay"));
-        LinkedList<Object[]> sqlsDataD = new LinkedList<>();
             sqlsDataD.add(orderTicketEntities.getSynOrderObject(strTime, strTime));
 
-
             //vo
             HashMap<String, Object> orderTicketVo = new HashMap<>();
             orderTicketVo.put("paymentType", orderTickets.getPaymentType());
@@ -883,6 +887,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
             // 大麦回调
             sycDamaiOrder(orderTickets.getOrderTicketsId());
+        }else{
+             orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
+        }
         redisLockUtil.unlock(lock);
         return "success";
     }

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

@@ -17,6 +17,7 @@ import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
@@ -25,6 +26,8 @@ import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerServ
 import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import com.mongodb.BasicDBObject;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.ReturnDocument;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -479,6 +482,14 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     ticketStatusUpdate.setUpdatedAt(updatedAt);
                     ticketStatusMapper.update(ticketStatusUpdate
                             , new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelationsItem.getTicketId()).eq("status", 7));
+
+                    HashMap<String,Object> map = new HashMap<>();
+                    map.put("status",9);
+                    map.put("updatedAt",updatedAt);
+                    mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
+                            Query.query(Criteria.where("ticketsId").is(ticketRelationsItem.getTicketId()).and("status").ne(7)).getQueryObject(),
+                            new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
+                    );
                 }
             }
 //            判断状态