diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 738efc513..11474f045 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -9,8 +9,10 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.controller.sys.UploadController; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxMerchant; import com.iformall.exception.MallinkException; +import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.WxAppinfoService; import com.iformall.service.wechat.FmOpenService; @@ -58,6 +60,9 @@ public class WxAppinfoController extends BaseController { @Autowired private AsyncTaskExecutor asyncTaskExecutor; + @Autowired + private WxCouponChannelMapper wxCouponChannelMapper; + @ApiOperation("加载老数据二维码") @GetMapping("/updateQrCode") public void updateQrCode(String p)throws ServletException, IOException { @@ -81,6 +86,29 @@ public class WxAppinfoController extends BaseController { } } + @ApiOperation("加载卷二维码") + @GetMapping("/updateCouponQrCode") + public void updateCouponQrCode(String p)throws ServletException, IOException { + if("xlldxx".equals(p)){ + String pageUrl = "pages/index/index"; + + List list = wxCouponChannelMapper.findQrcodeEmptyList(); + for (WxCouponChannel couponChannel:list) { + asyncTaskExecutor.execute(new Runnable() { + @Override + public void run() { + String param = couponChannel.getWeappScene(); + ResultData resultData = exportQrcode(null,null,couponChannel.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); + Map map = (Map)resultData.data; + String url = map.get("url"); + couponChannel.setQrCode(url); + wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + } + }); + } + } + } + @ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") @PostMapping("/downQrCode") public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException { diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 004b7cf79..6127ab1fb 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -113,8 +113,8 @@ fm: exception: false exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 - open: true - upload_dir: /home/test/server/uploads/ + open: false + upload_dir: ./upload/ ueditor: config: config.json diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql new file mode 100644 index 000000000..ebb0de472 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905251514__L_ALTER_RENT.sql @@ -0,0 +1,2 @@ +ALTER TABLE wx_coupon_channel + ADD COLUMN qr_code VARCHAR(500) DEFAULT NULL COMMENT '二维码'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index 7435b8ce1..c3f5d5a3a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -71,6 +71,8 @@ public class WxCouponChannel extends BaseEntity { private Date updateDate; @io.swagger.annotations.ApiModelProperty(value="子频道ID",name="subTargetId") private Long subTargetId; + @io.swagger.annotations.ApiModelProperty(value="二维码",name="qrCode") + private String qrCode; @Transient @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java index 7d346b787..eae1b6590 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java @@ -36,4 +36,6 @@ public interface WxCouponChannelMapper extends CommonMapper findQrcodeEmptyList(); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index d03421702..3bb1d2f92 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -292,5 +292,9 @@ delete from wx_coupon_channel where sub_target_id = #{id} + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index f131cf946..2f012dae5 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -37,6 +37,7 @@ + @@ -90,7 +91,7 @@ `id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, - `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund` + `press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,qr_code