Merge branch 'gray' into test6.9.6

@@ -64,7 +64,7 @@ public class TradeBillsController {
 	@RequestMapping(value = "/unbindingAuthorizeInfoByUid")
 	@RequestMapping(value = "/unbindingAuthorizeInfoByUid")
 	public ApiResponse unbindingAuthorizeInfoByUid(Integer uid) {
 	public ApiResponse unbindingAuthorizeInfoByUid(Integer uid) {
 		LOGGER.info("unbindingAuthorizeInfoByUid in. uid is {}", uid);
 		LOGGER.info("unbindingAuthorizeInfoByUid in. uid is {}", uid);
-
+		billsTradeService.unbindingAuthorizeInfoByUid(uid);
 		return new ApiResponse.ApiResponseBuilder().code(200).message("已解绑").build();
 		return new ApiResponse.ApiResponseBuilder().code(200).message("已解绑").build();
 	}
 	}
 
 

@@ -254,12 +254,14 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
 		LOGGER.info("unbindingAuthorizeInfoByUid service in. unbinding uid is {},operator user id {} ,user name {},userInfo {}", uid,userInfo.getUserId(),userInfo.getUserName(),userInfo);
 		LOGGER.info("unbindingAuthorizeInfoByUid service in. unbinding uid is {},operator user id {} ,user name {},userInfo {}", uid,userInfo.getUserId(),userInfo.getUserName(),userInfo);
 		//TODO 记录解绑日志 ，调用解绑接口，并且清理本地local cache缓存
 		//TODO 记录解绑日志 ，调用解绑接口，并且清理本地local cache缓存
 
 
-		/*AuthorizeInfoReq req = new AuthorizeInfoReq();
+		AuthorizeInfoReq req = new AuthorizeInfoReq();
 		req.setUid(uid);
 		req.setUid(uid);
 		req.setOperatorUid(userInfo.getUserId());
 		req.setOperatorUid(userInfo.getUserId());
 		req.setOperatorName(userInfo.getUserName());
 		req.setOperatorName(userInfo.getUserName());
+		JSONObject jsonObject = serviceCaller.asyncCall("userRealNameAuthorize.clearAliPayAccount", req, JSONObject.class).get(5);
+		LOGGER.info("unbindingAuthorizeInfoByUid service in. unbinding uid is {},call result jsonObject {},userInfo {}", uid,JSON.toJSONString(jsonObject),userInfo);
 
 
-		localUidAlipayAccountCache.invalidate(uid);*/
+		localUidAlipayAccountCache.invalidate(uid);
 	}
 	}
 
 
 
 

@@ -105,8 +105,6 @@ function getAuthorizeInfoList(param){
 }
 }
 
 
 function openUnbindingConfirmDialog(uid) {
 function openUnbindingConfirmDialog(uid) {
-    alert("开发中...");
-    return ;
     $.messager.confirm("确认解绑", "是否确认解绑[uid="+uid+"]", function(flag) {
     $.messager.confirm("确认解绑", "是否确认解绑[uid="+uid+"]", function(flag) {
         if (flag) {
         if (flag) {
             $.post(contextPath + "/tradeBills/unbindingAuthorizeInfoByUid", {
             $.post(contextPath + "/tradeBills/unbindingAuthorizeInfoByUid", {

@@ -511,6 +511,7 @@ function getOrderInfo(orderCode){
             	 $("#sizeName").html(result.data.sizeName);
             	 $("#sizeName").html(result.data.sizeName);
             	 $("#goodsPrice").html(result.data.goodsPrice);
             	 $("#goodsPrice").html(result.data.goodsPrice);
             	 $("#couponCutAmount").html(result.data.couponCutAmount);
             	 $("#couponCutAmount").html(result.data.couponCutAmount);
+                 $("#activityCutAmount").html(result.data.activityCutAmount);
             	 $("#productNum").html(result.data.productNum);
             	 $("#productNum").html(result.data.productNum);
             	 $("#shipFee").html(result.data.shipFee);
             	 $("#shipFee").html(result.data.shipFee);
             	 $("#amount").html(result.data.amount);
             	 $("#amount").html(result.data.amount);