Merge remote-tracking branch 'origin/wholesale' into wholesale

wholesale/src/main/java/com/yhlxj/dao/model/dto/WebWholesaleConfigDto.java

@@ -33,5 +33,5 @@ public class WebWholesaleConfigDto {
 	/**
 	 * 规格原价
 	 */
-	private BigDecimal oriPirce;
+	private BigDecimal oriPrice;
 }

wholesale/src/main/java/com/yhlxj/web/controller/manage/WholesaleCodeController.java

@@ -86,7 +86,7 @@ public class WholesaleCodeController {
 				.eq(SysConfig::getSysKey, Constant.WEB_WHOLESALE_CONFIG_KEY)
 				.last("limit 1"));
 		WebWholesaleConfigDto webWholesaleConfigDto = Jsons.parseObject(sysConfig.getSysValue(), WebWholesaleConfigDto.class);
-		webWholesaleConfigDto.setOriPirce(skuMapper.getSkuPriceByIds(webWholesaleConfigDto.getSkuIds()));
+		webWholesaleConfigDto.setOriPrice(skuMapper.getSkuPriceByIds(webWholesaleConfigDto.getSkuIds()));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(webWholesaleConfigDto);
 	}
 

wholesale/src/main/resources/mapper/AccountBlockedReplaceRecordMapper.xml

@@ -10,6 +10,6 @@
 
     <select id="getSkuPriceByIds" resultType="java.math.BigDecimal">
         select sum(price) from goods_don_sku where id in
-        <foreach collection="skuIds" item="item" open="(" separator="," close=")">#{item}</foreach>)
+        <foreach collection="skuIds" item="item" open="(" separator="," close=")">#{item}</foreach>
     </select>
 </mapper>