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

liquidnet-bus-common/liquidnet-common-feign/src/main/java/com/liquidnet/common/feign/interceptor/SecuringRequestInterceptor.java

+package com.liquidnet.common.feign.interceptor;
+
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.ServletUtils;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Component
+public class SecuringRequestInterceptor implements RequestInterceptor {
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        HttpServletRequest request = ServletUtils.getRequest();
+        requestTemplate.header(CurrentUtil.uToken, request.getHeader(CurrentUtil.uToken));
+    }
+}

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

@@ -101,7 +101,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         try {
             if (payOrderParam.getVoucherType() != null && payOrderParam.getVoucherType().equals(3)) {
                 isPay = false;
-                if(payOrderParam.getNumber()>1){
+                if (payOrderParam.getNumber() > 1) {
                     return ResponseDto.failure("张数大于1不支持兑换");//参数错误
                 }
             }
@@ -952,7 +952,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 //                    log.info("下单消息模版错误",e);
 //                }
                 //加分
-                orderUtils.doTask(orderTickets.getUserId());
+                orderUtils.doTask(orderTickets.getUserId(), orderTicketData.getPerformanceTitle(), orderTicketData.getPriceActual());
                 //大麦回调
                 sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());
             }

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

@@ -148,14 +148,15 @@ public class OrderUtils {
         return surplusGeneral;
     }
 
-    public void doTask(String uid) {
+    public void doTask(String uid,String title,BigDecimal price) {
         try {
             MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
             header.add("Accept", "application/json;charset=UTF-8");
             MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-            params.add("taskId", "1");
+            params.add("score", price.intValue()+"");
+            params.add("content", "购买演出:"+title);
             params.add("uid", uid);
-            String resultData = HttpUtil.post(stoneUrl + "/user/inner/doTask", params, header);
+            String resultData = HttpUtil.post(stoneUrl + "/user/logs/in2111", params, header);
         } catch (Exception e) {
             log.error("添加积分失败,e:{}", e);
             e.printStackTrace();