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

Dev

See merge request quanshu/mp-server!74

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

@@ -81,7 +81,6 @@ public class TicketBoxMgrController extends BaseApiController {
 	@ApiOperation(value = "新增盲票", notes = "管理端创建盲票")
 	@PostMapping("/create")
 	public AjaxResult create(@Validated @RequestBody TicketBoxCreateParam param) {
-		LogUtil.info(logger, "create ticket box, param:" , JSONObject.toJSONString(param));
 		if (param.getType() == TicketTypeEnum.OFFLINE) {
 			if (param.getPkgSalePrice() == null || param.getPkgSalePrice() == 0 ) {
 				return AjaxResult.error("采购单价必须大于0");

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

@@ -80,7 +80,7 @@ public class ChannelInviteController extends BaseApiController {
 			return AjaxResult.success(channel.getChannelId());
 		}
 		String type = jsonObject.getString("type");
-		String rst = wxUrlLinkService.generateCode("", "id=" + channelId + ",type=" + type);
+		String rst = wxUrlLinkService.generateCode("/pages/login/invitation", "id=" + channelId + ",type=" + type);
 		return AjaxResult.success(rst);
 	}
 

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBox.java

@@ -66,6 +66,7 @@ public class TicketBox implements Serializable {
    * 盲票形式（线上或线下）
    */
   @TableField("type")
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private TicketTypeEnum type;
 
   /**

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

@@ -111,7 +111,6 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
       }
     }
     ticketAwardsService.saveBatch(ticketAwardsList);
-    LogUtil.info(logger, "保存奖品列表，awardsPrizeList:{0}", JSONObject.toJSONString(awardsPrizeList));
     ticketAwardsPrizeService.saveBatch(awardsPrizeList);
 
     // TODO 分包，生成券