diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java
index 3aac166a2..85356e073 100644
--- a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java
+++ b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java
@@ -31,7 +31,7 @@ public class PosController extends BaseController {
private final PosService posService;
private final ThDevInfoService thDevInfoService;
- @ApiOperation(value = "获取注册二维码", notes = "{" +
+ @ApiOperation(value = "获取注册二维码及小票二维码规则", notes = "{" +
"\"dev_id\":\"string(必填)\"," +
"\"tenant_id\":\"string(必填)\"," +
"\"nonce_str\":\"string(必填)\"}")
diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
index 33927b94a..2ca7b9509 100644
--- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
+++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
@@ -71,7 +71,8 @@ public class PosServiceImpl implements PosService {
logger.error(ErrorCode.MALL_INFO_NOT_FOUND.getMessage());
throw new MallinkException(ErrorCode.MALL_INFO_NOT_FOUND);
}
- retMap.put("qrcode_url", mall.getImgQrcodeWeapp());
+ retMap.put(WxPayConstant.REG_QRCODE_URL, mall.getImgQrcodeWeapp());
+ retMap.put(WxPayConstant.POS_QRCODE_RULE, mall.getPosQrcodeRule());
return retMap;
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
index 20788363b..361f432fe 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
@@ -66,6 +66,9 @@ public class WxMall extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="分享封面图片",name="weappShareCoverImg")
private String weappShareCoverImg;
+ @io.swagger.annotations.ApiModelProperty(value="POS小票二维码规则",name="posQrcodeRule")
+ private String posQrcodeRule;
+
@io.swagger.annotations.ApiModelProperty(value="销售类型",name="saleType")
private Integer saleType;
@io.swagger.annotations.ApiModelProperty(value="启用开始时间",name="validStart")
diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java
index 56e61f0c3..6ce41df36 100644
--- a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java
+++ b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java
@@ -29,6 +29,9 @@ public class WxPayConstant {
public final static String MEM_PHONE = "mem_phone";
public final static String VERIFY_TYPE = "verify_type";
+ public final static String REG_QRCODE_URL = "qrcode_url";
+ public final static String POS_QRCODE_RULE = "pos_qrcode_rule";
+
public final static String MEM_DISCOUNT = "discount";
public final static String MEM_LEVEL = "level";
diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml
index f1fa14138..f1aa37087 100644
--- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml
@@ -22,6 +22,7 @@
+
@@ -31,7 +32,7 @@
`id`,`tenant_id`,`name`,`group`,`country`,`province`,`city`,`addr`,
`total_area`,`operating_area`,`park_area`,`park_place_number`,`service_phone`,
`img_url`,`img_url_h`, `weap_note`, `img_qrcode_weapp`, `img_qrcode_wemp`,
- `weapp_share_title`,`weapp_share_cover_img`,
+ `weapp_share_title`,`weapp_share_cover_img`, `pos_qrcode_rule`,
`sale_type`, `valid_start`, `valid_end`