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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/list.html

@@ -26,7 +26,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="sweet:integralActivity:create">
+            <a class="btn btn-success" onclick="$.operate.addTab(1)" shiro:hasPermission="sweet:integralActivity:create">
                 <i class="fa fa-plus"></i> 添加
             </a>
         </div>
@@ -52,7 +52,7 @@
     $(function () {
         var options = {
             url: prefix + "/list",
-            updateUrl: prefix + "/formView", // /update/{id}
+            updateUrl: prefix + "/formView?id={id}", // /update/{id}
             createUrl: prefix + "/formView",
             detailUrl: "/sweet/IntegralActivityDraw/listView/{id}",
             exportUrl: "/sweet/IntegralActivityDraw/export",

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

@@ -946,6 +946,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 //                }catch (Exception e){
 //                    log.info("下单消息模版错误",e);
 //                }
+                //加分
+                orderUtils.doTask(orderTickets.getUserId());
                 //大麦回调
                 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

@@ -149,12 +149,17 @@ public class OrderUtils {
     }
 
     public void doTask(String uid) {
-        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("uid", uid);
-        String resultData = HttpUtil.post(stoneUrl + "/user/inner/doTask", params, header);
+        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("uid", uid);
+            String resultData = HttpUtil.post(stoneUrl + "/user/inner/doTask", params, header);
+        }catch (Exception e){
+            log.error("添加积分失败,e:{}",e);
+            e.printStackTrace();
+        }
     }
 
     public AdamUserMemberVo isMember(String uid) {