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

Dev

See merge request quanshu/mp-server!105

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

@@ -84,7 +84,7 @@ public class CouponMgrController extends BaseApiController {
 	private MapperFacade mapperFacade;
 
 	/**
-	 * 获取我的下级代金券列表信息，支持翻页
+	 * 获取代金券列表信息，支持翻页
 	 *
 	 * @return
 	 */
@@ -95,6 +95,7 @@ public class CouponMgrController extends BaseApiController {
 		LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper<Coupon>();
 		queryWrapper.like(null != coupon && StringUtils.isNotBlank(coupon.getTitle()), Coupon::getTitle, coupon.getTitle());
 		queryWrapper.eq(null != coupon && null != coupon.getStatus(), Coupon::getStatus, coupon.getStatus());
+		queryWrapper.eq(null != coupon && null != coupon.getType(), Coupon::getType, coupon.getType());
 		queryWrapper.eq(Coupon::getIsDeleted, 0);
 		queryWrapper.orderByAsc(Coupon::getCreatedTime);
 		list = couponService.list(queryWrapper);
@@ -192,6 +193,9 @@ public class CouponMgrController extends BaseApiController {
 //				&& ticketList.size() == 0) {
 //			return AjaxResult.error("使用范围为指定盲票时需要至少选择一种盲票");
 //		}
+		if(StringUtils.isBlank(coupon.getPicUrl())) {
+			coupon.setPicUrl("coupon_def.jpeg");
+		}
 		// 3.插入数据
 		try {
 			couponService.saveCoupon(coupon,ticketList);

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

@@ -169,9 +169,6 @@ public class GoodsMgrController extends BaseApiController {
 		if(null == goods.getOriginPrice()) {
 			goods.setOriginPrice(goods.getExchangePrice());
 		}
-		if(StringUtils.isBlank(goods.getPicUrl())) {
-			goods.setPicUrl("coupon_def.jpeg");
-		}
 		// 多SKU
 		List<GoodsSku> skuList = goodsParam.getSkuList();
 		if(goods.getMultiSku() == 1) { //