Merge branch 'test6.9.6' of http://git.yoho.cn/ufo/ufo-platform into test6.9.6

@@ -246,7 +246,7 @@
         </if>
         where 1=1 
         <include refid="Query_Order_Sql" />
-        order by a.update_time desc 
+        order by a.create_time desc
         <if test="buyerOrderReq.start!=null and buyerOrderReq.size != null">
         limit #{buyerOrderReq.start},#{buyerOrderReq.size}
         </if>

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

@@ -14,6 +14,8 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yoho.ufo.dal.ProductLimitSaleMapper;
+import com.yoho.ufo.dal.model.ProductLimitSale;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.common.collect.Lists;
@@ -198,6 +200,9 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 	@Autowired
 	private PhoneUidDepotMapper phoneUidDepotMapper;
 
+	@Autowired
+	private ProductLimitSaleMapper productLimitSaleMapper;
+
     private static final String BUYER_ORDER_META_KEY_DELIVERY_ADDRESS = "delivery_address";
     
     private static final String SELLER_ORDER_META_KEY_BACK_DELIVERY_ADDRESS = "back_delivery_address";
@@ -1766,9 +1771,17 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 
 		queryAberrationNum(resp, buyerOrder.getSellerUid());  // 查询违规记录数
 
+		queryProductLimitInfo(resp, sellerGoods.getProductId(), buyerOrder.getSellerUid());  // 独家标识
+
     	return resp;
     }
 
+	private void queryProductLimitInfo(QcOrderDetailResp resp, Integer productId, Integer sellerUid) {
+		List<ProductLimitSale> productLimitSales = productLimitSaleMapper.selectUserPermissionProductIds(Lists.newArrayList(productId), sellerUid);
+		resp.setOnlyLogo(CollectionUtils.isEmpty(productLimitSales) ? null : "独家");
+		resp.setOnlyLogoValue(CollectionUtils.isEmpty(productLimitSales) ? 0 : 1);
+	}
+
 	private void queryAberrationNum(QcOrderDetailResp resp, Integer sellerUid) {
 		resp.setAberrationNum(buyerOrderMapper.selectCountByUidStatus(Lists.newArrayList(OrderStatus.CHECKING_FAKE.getCode()), sellerUid));
 	}

@@ -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);
 		//TODO 记录解绑日志 ，调用解绑接口，并且清理本地local cache缓存
 
-		/*AuthorizeInfoReq req = new AuthorizeInfoReq();
+		AuthorizeInfoReq req = new AuthorizeInfoReq();
 		req.setUid(uid);
 		req.setOperatorUid(userInfo.getUserId());
 		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) {
-    alert("开发中...");
-    return ;
     $.messager.confirm("确认解绑", "是否确认解绑[uid="+uid+"]", function(flag) {
         if (flag) {
             $.post(contextPath + "/tradeBills/unbindingAuthorizeInfoByUid", {

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

@@ -232,7 +232,7 @@
 			<div class="red" style="margin-left:120px;">*每个关键词用英文逗号隔开</div>
 		</li>
 
-		<li>
+		<li style="display: none;">
 			<h2>商品图文介绍</h2>
 			<div>
 				<script id="editor" type="text/plain" style="width:1024px;height:500px;"></script>