|
@@ -16,9 +16,11 @@ import com.uas.platform.b2c.core.constant.SplitChar;
|
|
|
import com.uas.platform.b2c.core.constant.Status;
|
|
import com.uas.platform.b2c.core.constant.Status;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.core.utils.DoubleArith;
|
|
import com.uas.platform.b2c.core.utils.DoubleArith;
|
|
|
|
|
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
|
|
|
import com.uas.platform.b2c.core.utils.NumberUtil;
|
|
import com.uas.platform.b2c.core.utils.NumberUtil;
|
|
|
import com.uas.platform.b2c.core.utils.PatternUtil;
|
|
import com.uas.platform.b2c.core.utils.PatternUtil;
|
|
|
import com.uas.platform.b2c.external.erp.commodity.util.ModelConverter;
|
|
import com.uas.platform.b2c.external.erp.commodity.util.ModelConverter;
|
|
|
|
|
+import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.IntegerConstant;
|
|
import com.uas.platform.b2c.prod.commodity.constant.IntegerConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
|
|
import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
|
|
|
import com.uas.platform.b2c.prod.commodity.dao.*;
|
|
import com.uas.platform.b2c.prod.commodity.dao.*;
|
|
@@ -3016,7 +3018,7 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 根据productid
|
|
|
|
|
|
|
+ * 根据productid 获取删除的信息
|
|
|
*
|
|
*
|
|
|
* @param productid
|
|
* @param productid
|
|
|
*/
|
|
*/
|
|
@@ -3090,4 +3092,50 @@ public class GoodsServiceImpl implements GoodsService {
|
|
|
|
|
|
|
|
return ResultMap.success(null);
|
|
return ResultMap.success(null);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 修正测试的数据
|
|
|
|
|
+ *
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public String modifyData() {
|
|
|
|
|
+ Long countGoods = goodsDao.getCountGoods();
|
|
|
|
|
+ Long start = 0l, length = 1000l;
|
|
|
|
|
+ List<GoodsHistory> histories = new ArrayList<>();
|
|
|
|
|
+ List<Goods> goodses = new ArrayList<>();
|
|
|
|
|
+ Boolean isModify = false;
|
|
|
|
|
+ while (Long.compare(start, countGoods) < 0) {
|
|
|
|
|
+ List<Goods> goodsByPage = goodsDao.findGoodsByPage(start, length);
|
|
|
|
|
+ for (Goods goods : goodsByPage) {
|
|
|
|
|
+ isModify = false;
|
|
|
|
|
+ String qtyPrice = goods.getQtyPrice();
|
|
|
|
|
+ List<GoodsQtyPrice> list = FastjsonUtils.fromJsonArray(qtyPrice, GoodsQtyPrice.class);
|
|
|
|
|
+ int size = list.size() - 1;
|
|
|
|
|
+ GoodsQtyPrice goodsQtyPrice = list.get(size);
|
|
|
|
|
+ goodsQtyPrice.setEnd(DoubleConstant.maxReserve);
|
|
|
|
|
+ Double end1 = list.get(0).getEnd();
|
|
|
|
|
+ while (NumberUtil.compare(goods.getMinBuyQty(), end1) >= 0) {
|
|
|
|
|
+ list.remove(0);
|
|
|
|
|
+ end1 = list.get(0).getEnd();
|
|
|
|
|
+ isModify = true;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (NumberUtil.compare(goods.getMinBuyQty(), list.get(0).getStart()) != 0) {
|
|
|
|
|
+ list.get(0).setStart(goods.getMinBuyQty());
|
|
|
|
|
+ isModify = true;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (isModify) {
|
|
|
|
|
+ goods.setQtyPrice(FastjsonUtils.toJson(list));
|
|
|
|
|
+ GoodsHistory goodsHistory = goodsHistoryService.converTGoodsHist(goods, OperateType.MODIFY_PRICE.getPhrase());
|
|
|
|
|
+ histories.add(goodsHistory);
|
|
|
|
|
+ goodses.add(goods);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ start = start + length;
|
|
|
|
|
+ }
|
|
|
|
|
+ goodsHistoryService.save(histories);
|
|
|
|
|
+ goodsDao.save(goodses);
|
|
|
|
|
+ return String.valueOf(goodses.size());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|