Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!112

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -229,10 +229,14 @@ public class GoodsMgrController extends BaseApiController {
 				return AjaxResult.error("商品" + goods.getTitle() + "不满足多SKU条件！");
 			}else {
 				GoodsSku firstGoodsSku = skuList.get(0);
-				goods.setOriginPrice(firstGoodsSku.getOriginPrice());
 				goods.setExchangePrice(firstGoodsSku.getExchangePrice());
 				goods.setValue(firstGoodsSku.getValue());
 				goods.setCost(firstGoodsSku.getCost());
+				if(null == firstGoodsSku.getOriginPrice()) {
+					goods.setOriginPrice(firstGoodsSku.getExchangePrice());
+				}else {
+					goods.setOriginPrice(firstGoodsSku.getOriginPrice());
+				}
 				// 累计库存
 				int totalQuantity = skuList.stream().mapToInt(GoodsSku::getQuantity).sum();
 				goods.setQuantity(totalQuantity);

mp-service/src/main/java/com/qs/mp/admin/service/impl/GoodsServiceImpl.java

@@ -50,6 +50,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 			for(GoodsSku goodsSku:skuList) {
 				if(null != goodsSku) {
 					goodsSku.setGoodsId(goods.getGoodsId());
+					if(null == goodsSku.getOriginPrice()) {
+						goodsSku.setOriginPrice(goodsSku.getExchangePrice());
+					}
 				}
 			}
 			boolean skuRes = goodsSkuService.saveBatch(skuList);
@@ -72,6 +75,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 			for(GoodsSku goodsSku:skuList) {
 				if(null != goodsSku) {
 					goodsSku.setGoodsId(goods.getGoodsId());
+					if(null == goodsSku.getOriginPrice()) {
+						goodsSku.setOriginPrice(goodsSku.getExchangePrice());
+					}
 				}
 			}
 			// TODO 未完待续