Merge branch 'dev-kanjia' into dev6.8.2

@@ -117,7 +117,7 @@ public class CutDownProductPriceRest {
             throw new ServiceException(ServiceError.ACTIVITY_CUTDOWNPRICE_YOU_HASNOT_CUTDOWN_SUCCESS_ERROR);
         }
         // 校验是否已经使用过
-        if(productInfo.getUseCount()==0){
+        if(productInfo.getCanUseCount()==0){
             logger.warn(" you have used this cutdown, params is {}", cutPriceHelpUserRequestBO);
             throw new ServiceException(ServiceError.ACTIVITY_CUTDOWNPRICE_YOU_HAS_USED_CUTDOWNORDER_ERROR);
         }

@@ -124,7 +124,7 @@ public class CutDownPriceServiceImpl implements ICutDownPriceService {
         ProductBo[] productBoArray = serviceCaller.call("product.batchQueryNamesAndImageBySkns", request, ProductBo[].class);
         // 组装信息
         CutDownPriceActivityProductBo bo = buildCutDownPriceActivityProductBo(activityBo, cutDownPriceProductBo, helpUserBos, productBoArray);
-        bo.setUseCount(selectCutdownPriceOrderRecordCount(cutPriceHelpUserRequestBO));
+        bo.setCanUseCount(selectCutdownPriceOrderRecordCount(cutPriceHelpUserRequestBO));
         return bo;
     }
 
@@ -147,7 +147,7 @@ public class CutDownPriceServiceImpl implements ICutDownPriceService {
         CutDownPriceActivityProductBo bo = buildCutDownPriceActivityProductBo(activityBo, cutDownPriceProductBo, null, null);
         if(record!=null){
             // 设置是否已使用
-            bo.setUseCount(record.getUseCount());
+            bo.setCanUseCount(record.getUseCount());
             // 设置已砍价记录
             bo.setHasJoinNum(record.getHelpCount());
         }