diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906241400__DROP_SCREENAD_QRCODE.sql b/mallinkAdmin/src/main/resources/db/migration/V201906241400__DROP_SCREENAD_QRCODE.sql
new file mode 100644
index 000000000..e439c620c
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201906241400__DROP_SCREENAD_QRCODE.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `wx_screen_ad`
+DROP COLUMN `qrcode`;
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java
index f6f092cf4..6255b0033 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java
@@ -59,9 +59,6 @@ public class WxScreenAd extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="广告目标ID: couponChannelId or campaignId",name="targetId")
private Long targetId;
- @io.swagger.annotations.ApiModelProperty(value="广告目标二维码",name="qrcode")
- private byte[] qrcode;
-
@Transient
protected Object target;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java
index c70dd7076..672df8b72 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java
@@ -34,18 +34,12 @@ import java.util.List;
public class WxScreenAdServiceImpl implements WxScreenAdService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
- @Autowired
- private boolean isFmOpen;
-
@Autowired
WxScreenAdMapper wxScreenAdMapper;
@Autowired
WxAppinfoService wxAppinfoService;
- @Autowired
- private FmOpenService openService;
-
@Autowired
WxCouponChannelMapper wxCouponChannelMapper;
@@ -89,15 +83,10 @@ public class WxScreenAdServiceImpl implements WxScreenAdService {
record.setId(idWorker.nextId());
record.setCreateDate(new Date());
record.setUpdateDate(new Date());
- setQrcode(record);
- if (record.getQrcode() == null)
- return new ResultData(ErrorCode.DEVICE_QRCODE_GET_FAILED);
-
wxScreenAdMapper.insertSelective(record);
} else {
record.setUpdateDate(new Date());
- setQrcode(record);
wxScreenAdMapper.updateByPrimaryKeySelective(record);
}
return new ResultData();
@@ -142,63 +131,4 @@ public class WxScreenAdServiceImpl implements WxScreenAdService {
wxScreenAdMapper.updateStatusByCouponChannelId(wxScreenAd);
});
}
-
-
- private void setQrcode(WxScreenAd record){
- if (record.getTargetId() != null &&
- record.getType() != null &&
- record.getTenantId() != null)
- try {
- record.setQrcode(getQrcode(record.getTargetId(),
- record.getType().intValue(),
- record.getSubType().intValue(),
- wxAppinfoService.getCAppInfo(record.getTenantId())));
- }catch (Exception e) {
- logger.error("QRCODE set Error:"+e.getMessage());
- }
- }
-
- private static int QRCODE_WIDTH = 280;
- private static String QRCODE_PAGE_HOME = "pages/index/index";
- private static boolean QRCODE_AUTO_COLOR = false;
- private static boolean QRCODE_IS_HYALINE = true;
- //private static int QRCODE_LINCOLOR =;
-
- private static String QRCODE_JUMP_CMD_HOME = "JH";
- private static String QRCODE_JUMP_CMD_COUPON = "JC";
- private static String QRCODE_JUMP_CMD_GROUP = "JG";
- private static String QRCODE_JUMP_CMD_CAMPGIN = "JB";
-
- private byte[] getQrcode(Long id, int type, int subType, WxAppinfo appInfo) throws Exception {
- if(appInfo == null) {
- logger.error("QRCODE get error: appinfo is null");
- return null;
- }
- WxMaService wxMaService = null;
- if(isFmOpen) {
- wxMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appInfo.getAppId());
- } else {
- wxMaService = MaUtil.getWeappService(appInfo);
- }
-
- String scene = "";
- if (EnumScreenAdType.COUPON.getCode().equals(type)) {
- if (EnumCouponChannelType.COUPON_CHANNEL_ID_ORDER_GROUP.getCode().equals(subType)) {
- scene = QRCODE_JUMP_CMD_GROUP + ":" + id.toString();
- } else {
- scene = QRCODE_JUMP_CMD_COUPON + ":" + id.toString();
- }
- }
- else if (EnumScreenAdType.CAMPAIGN.getCode().equals(type))
- scene = QRCODE_JUMP_CMD_CAMPGIN+":"+id.toString();
- else
- scene = QRCODE_JUMP_CMD_HOME+":"+"0";
-
- try {
- return wxMaService.getQrcodeService().createWxaCodeUnlimitBytes(scene, QRCODE_PAGE_HOME, QRCODE_WIDTH, QRCODE_AUTO_COLOR, null, QRCODE_IS_HYALINE);
- }catch (WxErrorException e) {
- logger.error("QRCODE get error: " + e.getMessage());
- }
- return null;
- }
}
diff --git a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml
index 70d7dd33d..8e9929502 100644
--- a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml
@@ -12,11 +12,10 @@
-
- `id`, `tenant_id`, `title`, `type`, `sub_type`, `status`, `create_date`, `update_date`, `cover_img`, `target_id`, `qrcode`
+ `id`, `tenant_id`, `title`, `type`, `sub_type`, `status`, `create_date`, `update_date`, `cover_img`, `target_id`