Merge remote-tracking branch 'origin/master' into consumer_unite

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/constant/GalaxyErrorEnum.java

@@ -20,7 +20,6 @@ public enum GalaxyErrorEnum {
     SERIES_CLAIM_PROCESSING("NFT0010008","系列声明正在处理中,不允许重复声明！"),
     SERIES_CLAIM_SUCCESSED("NFT0010009","系列已声明成功，不允许重复声明！"),
     SERIES_CLAIM_NOT_EXIST("NFT0010010","系列声明初始化信息不存在，请检查是否已上传对应素材！"),
-    SERIES_NFT_INFO_NOT_EXIST("NFT0010015","系列NFT信息查询不存在！"),
     PUBLISH_ORDER_NOT_EXIST("NFT0010011","NFT购买订单不存在!"),
     NFT_BUY_TASK_NOT_EXIST("NFT0010012","NFT购买执行任务不存在"),
     NFT_BUY_TASK_HAVE_EXIST("NFT0010013","NFT购买执行任务已存在，不可以重复购买!"),
@@ -33,7 +32,9 @@ public enum GalaxyErrorEnum {
     NFT_QUERY_FAIL_ORDER_NOT_EXIST("NFT0010020","NFT订单不存在!"),
     NFT_QUERY_FAIL_NFT_NOT_EXIST("NFT0010021","NFT信息查询不存在!"),
     NFT_QUERY_FAIL_SERIES_NOT_EXIST("NFT0010022","系列信息查询不存在!"),
-    NFT_USER_HAS_OPEN_ACCOUNT("NFT0010023","用户已经开通过数字账户!");
+    NFT_USER_HAS_OPEN_ACCOUNT("NFT0010023","用户已经开通过数字账户!"),
+    SERIES_NFT_INFO_NOT_EXIST("NFT0010024","系列NFT信息查询不存在！"),
+    SERIES_NFT_HASH_CREATE_FAIL("NFT0010025","系列NFT的介质hash生成失败！");
 
 
     private String code;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkInfoVo.java

@@ -49,6 +49,8 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
 
     @ApiModelProperty(position = 26, value = "单品ID")
     private String skuId;
+    @ApiModelProperty(position = 27, value = "展示预览图片URL[256]")
+    private String skuWatchPic;
 
     private static final GoblinUserDigitalArtworkInfoVo obj = new GoblinUserDigitalArtworkInfoVo();
 

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

@@ -234,7 +234,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>');
-                        actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>');
+                        // actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>');
                         return actions.join('');
                     }
                 }]

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

@@ -243,11 +243,24 @@
         LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
         LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
         LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
-        if (dataInfo.freightPrice > 0) {
+        /*if (dataInfo.freightPrice > 0) {
             LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付 " + dataInfo.freightPrice + "元");
         } else {
             LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付");
+        }*/
+        var orderExpressTypeName = "";
+        switch (dataInfo.orderExpressType) {
+            case 1:
+                orderExpressTypeName = '寄付';
+                break;
+            case 2:
+                orderExpressTypeName = '到付';
+                break;
+            case 3:
+                orderExpressTypeName = '寄付';
+                break;
         }
+        LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, orderExpressTypeName);
         LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
         LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
         LODOP.SET_PRINT_STYLEA(0, "Bold", 1)

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

@@ -177,11 +177,24 @@
         LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
         LODOP.SET_PRINT_STYLEA(0, "FontSize", 8);
         LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
-        if (dataInfo.freightPrice > 0) {
+        /*if (dataInfo.freightPrice > 0) {
             LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付 " + dataInfo.freightPrice + "元");
         } else {
             LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, "到付");
+        }*/
+        var orderExpressTypeName = "";
+        switch (dataInfo.orderExpressType) {
+            case 1:
+                orderExpressTypeName = '寄付';
+                break;
+            case 2:
+                orderExpressTypeName = '到付';
+                break;
+            case 3:
+                orderExpressTypeName = '寄付';
+                break;
         }
+        LODOP.ADD_PRINT_TEXT(233, 26, 105, 20, orderExpressTypeName);
         LODOP.SET_PRINT_STYLEA(0, "FontName", "黑体");
         LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
         LODOP.SET_PRINT_STYLEA(0, "Bold", 1)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html

@@ -29,7 +29,7 @@
             <label class="col-sm-3 control-label is-required">头像：</label>
             <div class="col-sm-8">
                 <!--                <input name="img" class="form-control" type="text" th:value="*{img}" readonly required>-->
-                <img class="img-details" style="height: 800px;" name="img" th:src="*{img}"
+                <img class="img-details" style="height: 400px;" name="img" th:src="*{img}"
                      th:onclick="click_big([[*{img}]])">
             </div>
         </div>
@@ -87,7 +87,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">自我介绍：</label>
             <div class="col-sm-8">
-                <input name="introduce" class="form-control" type="text" th:value="*{introduce}" readonly required>
+                <textarea name="introduce" class="form-control" style="height: 200px; font-size: 16px;" type="text" th:text="*{introduce}" readonly required></textarea>
             </div>
         </div>
         <div class="form-group">

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

@@ -278,12 +278,12 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                         if (item.getEnterType() == 0 && !item.getEnterName().equals("")) {
                             log.info("[入场人错误数据] 入场人id = " + item.getOrderTicketEntitiesId() + " 入场人 name = " + item.getEnterName());
                         }
-                        if (empty.contains(orderTicketEntitiesKey)) {
-                            log.info("[ ORDER COPY ] orderId = " + orderTicketEntitiesKey);
-                            orderTicketEntitiesKey=Long.parseLong(orderTicketEntitiesKey+"1");
-                        }
-                        empty.add(orderTicketEntitiesKey);
-                        orderCount+=1;
+//                        if (empty.contains(orderTicketEntitiesKey)) {
+//                            log.info("[ ORDER COPY ] orderId = " + orderTicketEntitiesKey);
+//                            orderTicketEntitiesKey=Long.parseLong(orderTicketEntitiesKey+"1");
+//                        }
+//                        empty.add(orderTicketEntitiesKey);
+//                        orderCount+=1;
 
                         if (empty.contains(orderTicketEntitiesKey)) {
                             log.info("[ ORDER COPY ] orderId = " + orderTicketEntitiesKey);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -86,11 +87,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
     @Override
     public TableDataInfo listShow(SmileShowParam smileShowParam) {
-        PageInfo<KylinPerformances> pageInfo;
         TableDataInfo rspData = new TableDataInfo();
         //查询所有代理的演出id
-        List<KylinPerformances> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent();
-        pageInfo = new PageInfo<>(kylinPerformancesList);
+        List<KylinPerformances> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent((smileShowParam.getPageNum()-1)* smileShowParam.getPageSize(),smileShowParam.getPageSize());
         List<ShowVo> showVoList = kylinPerformancesList.stream().map(kylinPerformances -> {
             ShowVo vo = new ShowVo();
             //演出id
@@ -126,7 +125,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         }).collect(Collectors.toList());
         rspData.setCode(0);
         rspData.setRows(showVoList);
-        rspData.setTotal(pageInfo.getTotal());
+        rspData.setTotal(smileAgentMapper.selectCountPerId());
         return rspData;
     }
 
@@ -427,6 +426,14 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         showAgentVo.setPerformanceId(performancesId);
         showAgentVo.setTicketId(ticketAndStatusDao.getTicketsId());
         showAgentVo.setTitle(ticketAndStatusDao.getTitle());
+        //开始结束时间转换年月日
+        String start = ticketAndStatusDao.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String end = ticketAndStatusDao.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        if (start.equals(end)) {
+            showAgentVo.setTitle(ticketAndStatusDao.getTitle().concat("(").concat(start).concat(")"));
+        } else {
+            showAgentVo.setTitle(ticketAndStatusDao.getTitle().concat("(").concat(start).concat("--").concat(end).concat(")"));
+        }
         //总代票提
         showAgentVo.setTotalCarry(smileAgent.getTotalCarry());
         //普代票提

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/UserPathDto.java

@@ -92,6 +92,6 @@ public class UserPathDto implements Serializable, Cloneable {
         userPathDto.setResult(result);
         userPathDto.setUserAgent(request.getHeader(ServletUtils.HEADER_USER_AGENT));
 
-        return (LOG_NOW_PDK + merchantId).concat(LOG_SEPARATOR).concat(JsonUtils.toJson(instance));
+        return (LOG_NOW_PDK + (StringUtils.isEmpty(merchantId) ? interfaceName : merchantId)).concat(LOG_SEPARATOR).concat(JsonUtils.toJson(userPathDto));
     }
 }

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/biz/ZxlnftBiz.java

@@ -135,11 +135,18 @@ public class ZxlnftBiz {
      * @return
      */
     public String getHashString(String data){
+        SM3HashEncodeResp sm3HashEncodeResp = null;
+        try {
             SM3HashEncodeReq req = SM3HashEncodeReq.getNew();
             byte[] fileByteArray = this.getNftFileByteArray(data);
             req.setData(fileByteArray);
-        SM3HashEncodeResp sm3HashEncodeResp = walletSdkService.sM3HashEncode(req);
+            sm3HashEncodeResp = walletSdkService.sM3HashEncode(req);
             return sm3HashEncodeResp.getDigest();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage(),e);
+        }
+        return null;
     }
 
     /**

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin-test.yml

@@ -10,7 +10,7 @@ liquidnet:
     path: /data/logs
     name: service-goblin
     max-history: 7
-    level: info
+    level: debug
   mysql:
     database-name: test_ln_scene
   mongodb:

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderExpressListDao.java

@@ -63,6 +63,7 @@ public class OrderExpressListDao implements Serializable {
     private String city;
     private String county;
     private String number;
+    private Integer orderExpressType;
 
     private String useStart;
     private String timeTitle;

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java

@@ -67,7 +67,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
 
     List<KylinPerformances> selectByComment();
 
-    List<KylinPerformances> selectPerIdByAgent();
+    List<KylinPerformances> selectPerIdByAgent(@Param("pageNumber") Integer pageNumber, @Param("pageSize")Integer pageSize);
 
     List<KylinPerformancesDao> selectTicketIdByPerId(@Param("performancesId") String performancesId);
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderExpressMapper.xml

@@ -4,12 +4,13 @@
 
     <select id="selectPrintList" resultType="com.liquidnet.service.kylin.dao.OrderExpressListDao">
         SELECT a.*,
-               b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number,
+               b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number, kots.express_type AS order_express_type,
                d.use_start, d.title AS time_title, d.type AS time_type,
                e.title AS tickets_title, e.type AS tickets_type
         FROM kylin_order_express a
         INNER JOIN kylin_order_tickets b ON a.order_tickets_id = b.order_tickets_id
         INNER JOIN kylin_order_ticket_relations c ON b.order_tickets_id = c.order_id
+        LEFT JOIN kylin_order_ticket_status kots ON a.order_tickets_id = kots.order_id
         LEFT JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
         LEFT JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
         <where>
@@ -24,12 +25,13 @@
     </select>
     <select id="selectPrintListOfPerformanceId" resultType="com.liquidnet.service.kylin.dao.OrderExpressListDao">
         SELECT a.*,
-        b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number,
+        b.express_contacts, b.express_address, b.express_phone, b.province, b.city, b.county, b.number, kots.express_type AS order_express_type,
         d.use_start, d.title AS time_title, d.type AS time_type,
         e.title AS tickets_title, e.type AS tickets_type
         FROM kylin_order_express a
         INNER JOIN kylin_order_tickets b ON a.order_tickets_id = b.order_tickets_id
         INNER JOIN kylin_order_ticket_relations c ON b.order_tickets_id = c.order_id
+        LEFT JOIN kylin_order_ticket_status kots ON a.order_tickets_id = kots.order_id
         LEFT JOIN kylin_ticket_times d ON c.time_id = d.ticket_times_id
         LEFT JOIN kylin_tickets e ON c.ticket_id = e.tickets_id
         <where>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -720,6 +720,7 @@ GROUP BY user_mobile;
           AND kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id )
         group by kp.performances_id
         order by kp.comment desc, kp.time_start asc
+        limit #{pageNumber},#{pageSize}
     </select>
 
     <select id="selectTicketIdByPerId" resultType="com.liquidnet.service.kylin.dao.KylinPerformancesDao">

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileAgentMapper.java

@@ -31,4 +31,6 @@ public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
     List<SmileAgentDao> selectAgentList(@Param("performancesId") String performancesId);
 
     List<SmileAgent> selectAgentCarryGtZeroByPerId(@Param("performancesId")String performancesId);
+
+    int selectCountPerId();
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -117,4 +117,8 @@
           AND del_tag = 0
     </select>
 
+    <select id="selectCountPerId"  resultType="int">
+        SELECT COUNT(sa.id) FROM (SELECT id FROM smile_agent WHERE del_tag = 0 GROUP BY performance_id) sa;
+    </select>
+
 </mapper>

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileVolunteersProjectMapper.xml

@@ -36,15 +36,13 @@
         a.time_end,
         a.created_at,
         a.status,
-    IF(now() >time_end,2,1) as 'time_status',
---     count(b0.project_id) + count(b1.project_id) + count(b2.project_id) as 'all',
-        (select count(0) as 'count'from smile_volunteers as b0 where a.project_id = b0.project_id and b0.status = 0) as 'un_audit',
-        (select count(0) as 'count'from smile_volunteers as b0 where a.project_id = b0.project_id and b0.status = 1) as 'audit',
-        (select count(0) as 'count'from smile_volunteers as b0 where a.project_id = b0.project_id and b0.status = 2) as 'refuse'
+        IF(now() > time_end, 2, 1)   as 'time_status',
+        count(b0.status) as 'all',
+        sum(IF(b0.status = 0, 1, 0)) as 'un_audit',
+        sum(IF(b0.status = 1, 1, 0)) as 'audit',
+        sum(IF(b0.status = 2, 1, 0)) as 'refuse'
         from smile_volunteers_project as a
---     LEFT JOIN smile_volunteers as b0 on a.project_id = b0.project_id and b0.status = 0
---     LEFT JOIN smile_volunteers as b1 on a.project_id = b1.project_id and b1.status = 1
---     LEFT JOIN smile_volunteers as b2 on a.project_id = b2.project_id and b2.status = 2
+        LEFT JOIN smile_volunteers as b0 on a.project_id = b0.project_id
         <where>
             <if test="title!='' and title !=null">
                 AND title Like concat('%',#{title},'%')

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/XmlUtil.java

@@ -66,6 +66,7 @@ public class XmlUtil{
     public static <T> T  toBean(String xmlStr,Class<T> cls){
         //注意：不是new Xstream(); 否则报错：java.lang.NoClassDefFoundError: org/xmlpull/v1/XmlPullParserFactory
         XStream xstream=new XStream(new DomDriver());
+        xstream.ignoreUnknownElements();
         xstream.processAnnotations(cls);
         T obj=(T)xstream.fromXML(xmlStr);
         return obj;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinArtworkBiz.java

@@ -25,6 +25,7 @@ import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftInfoBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadTempSecretBo;
 import com.liquidnet.service.galaxy.dto.param.*;
+import com.liquidnet.service.galaxy.exception.GalaxyNftUserException;
 import com.liquidnet.service.galaxy.utils.GalaxyDataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -168,7 +169,12 @@ public class ZxinArtworkBiz {
             }
         }
 
-
+        //业务失败信息
+        String bizFailDesc = null;
+        //系统失败信息
+        String sysFailDesc = null;
+        GalaxyArtSeriesClaimRespDto seriesClaimRespDto = null;
+        try {
             /**
              * 进行系列声明
              */
@@ -189,7 +195,7 @@ public class ZxinArtworkBiz {
             String seriesId = null;
             String taskId = null;
 
-        GalaxyArtSeriesClaimRespDto seriesClaimRespDto = GalaxyArtSeriesClaimRespDto.getNew();
+            seriesClaimRespDto = GalaxyArtSeriesClaimRespDto.getNew();
             if(nft30RespDto.isSuccess()){
                 //第零个系列 无限制系列
                 taskId = nft30RespDto.getData().getTaskId();
@@ -210,6 +216,11 @@ public class ZxinArtworkBiz {
                     //构造系列nft信息
                     GalaxySeriesNftInfoBo seriesNftInfoBo = this.buildSeriesNftInfoBo(reqDto,seriesInfoBo,seriesNftUploadBo);
                     dataUtils.setSeriesNftInfoBo(reqDto.getRouterType(),reqDto.getSkuId(),seriesInfoBo,seriesNftInfoBo);
+
+                    if(StringUtil.isEmpty(seriesNftInfoBo.getNftHash())){
+                        log.error("生成nftHash error skuId:{} nftUrl is :{} ",seriesNftInfoBo.getSkuId(),seriesNftInfoBo.getNftUrl());
+                        throw new ZxlNftException(GalaxyErrorEnum.SERIES_NFT_HASH_CREATE_FAIL.getCode(),GalaxyErrorEnum.SERIES_NFT_HASH_CREATE_FAIL.getMessage());
+                    }
                 }
             }else{
                 return ResponseDto.failure(GalaxyErrorEnum.SERIES_CLAIM_ERROR.getCode(),GalaxyErrorEnum.SERIES_CLAIM_ERROR.getMessage());
@@ -221,6 +232,19 @@ public class ZxinArtworkBiz {
             seriesClaimRespDto.setSeriesId(seriesId);
             seriesClaimRespDto.setSeriesName(seriesName);
 
+        }catch(ZxlNftException e){
+            sysFailDesc = e.getMessage();
+            log.error(e.getMessage(),e);
+        }catch(Exception e){
+            sysFailDesc = e.getMessage();
+            log.error(e.getMessage(),e);
+        }
+        if(StringUtil.isNotEmpty(sysFailDesc)){
+            return ResponseDto.failure(sysFailDesc);
+        }
+        if(StringUtil.isNotEmpty(bizFailDesc)){
+            return ResponseDto.failure(bizFailDesc);
+        }
         return ResponseDto.success(seriesClaimRespDto);
     }
 
@@ -329,6 +353,13 @@ public class ZxinArtworkBiz {
         }
         String seriesCode = seriesNftInfoBo.getSeriesCode();
 
+        //如果nftUrl介质hash为空，则重新生成
+        if(StringUtil.isEmpty(seriesNftInfoBo.getNftHash())){
+            //更新系列对应的系列nft状态
+            seriesNftInfoBo.setNftHash(zxlnftBiz.getHashString(seriesNftInfoBo.getNftUrl()));
+            dataUtils.updateSeriesNftStatus(reqDto.getRouterType(),reqDto.getSkuId(),seriesNftInfoBo);
+        }
+
         //获取任务ID
         GalaxySeriesInfoBo seriesInfoBo = dataUtils.getSeriesInfoBo(reqDto.getRouterType(),seriesCode);
         if(StringUtil.isNull(seriesInfoBo)||StringUtil.isEmpty(seriesInfoBo.getSeriesClaimTaskId())){

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinUserDigitalArtworkServiceImpl.java

@@ -134,6 +134,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             artworkInfoVo.setArUrlIos(goodsSkuInfoVo.getArUrlIos());
             artworkInfoVo.setArUrlAndroid(goodsSkuInfoVo.getArUrlAndroid());
 //            artworkInfoVo.setGenerateTime(goodsSkuInfoVo.getDeclareAt());
+            artworkInfoVo.setSkuWatchPic(goodsSkuInfoVo.getSkuWatchPic());
 
             return artworkInfoVo;
         }

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

@@ -337,23 +337,23 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     vo.setIsCanTransfer(0);
                 }
                 //是否可回退
-//                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
-//                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
-//                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
-//                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
-//                            && orderTicketVo.getTransferStatus().equals(3)) {
-//                        vo.setIsCanBack(1);
-//                    } else {
-//                        vo.setIsCanBack(0);
-//                    }
-//                } else {
-//                    vo.setIsCanBack(0);
-//                }
-                if (orderTicketVo.getTransferStatus().equals(3) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
+                if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
+                    LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
+                    LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
+                    if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
+                            && orderTicketVo.getTransferStatus().equals(3)) {
                         vo.setIsCanBack(1);
                     } else {
                         vo.setIsCanBack(0);
                     }
+                } else {
+                    vo.setIsCanBack(0);
+                }
+//                if (orderTicketVo.getTransferStatus().equals(3) && LocalDateTime.now().isBefore(DateUtil.Formatter.yyyyMMddHHmmss.parse(orderTicketVo.getUseStart()))) {
+//                    vo.setIsCanBack(1);
+//                } else {
+//                    vo.setIsCanBack(0);
+//                }
                 // 快递票不可回退
                 if (orderTicketVo.getGetTicketType().equals("express")) {
                     vo.setIsCanBack(0);

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

@@ -4,9 +4,9 @@ kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id
 # ------------------------PV/UV----------------------------
 bi_ticket_access_records.insert=INSERT INTO `bi_ticket_access_records` (  `user_id`,  `access_type`,  `performance_id`,  `order_id`,  `order_code`,`ip_address`,  `area`,  `area_province`,  `area_city`,  `area_county`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?);
 # ------------------------创建订单----------------------------
-kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?)
+kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at,agent_status,agent_distributions,agent_id_master,agent_distributions_master)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status , produce_code, created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?)
 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.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/utils/XmlUtil.java

@@ -66,6 +66,7 @@ public class XmlUtil{
     public static <T> T  toBean(String xmlStr,Class<T> cls){
         //注意：不是new Xstream(); 否则报错：java.lang.NoClassDefFoundError: org/xmlpull/v1/XmlPullParserFactory
         XStream xstream=new XStream(new DomDriver());
+        xstream.ignoreUnknownElements();
         xstream.processAnnotations(cls);
         T obj=(T)xstream.fromXML(xmlStr);
         return obj;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -132,7 +132,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                         return ResponseDto.failure("您已超出限购数量～");
                     }
                 }
-                // 权限限购
+                // 权限限购 分批购不用这个规则
+                if (null == listId) {
                     boolean isVip = nftOrderUtils.isVipMember(uid);
                     String buyFactor = skuVo.getBuyFactor();
                     if (null == buyFactor) {
@@ -142,6 +143,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                     if (!isAuthBuy) {
                         return ResponseDto.failure("该商品仅限特定用户购买～");
                     }
+                }
                 // 判断优惠券不能一起使用
                 /*String platVoucherCode = payParam.getPlatVoucherCode();
                 String storeVoucherCode = payParam.getStoreVoucherCode();