Browse Source

[POS][修改]:添加小票二维码规则

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
b8a2d91c47
5 changed files with 11 additions and 3 deletions
  1. +1
    -1
      mallinkPosApi/src/main/java/com/iformall/controller/PosController.java
  2. +2
    -1
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java
  5. +2
    -1
      mallinkService/src/main/resources/mapper/WxMallMapper.xml

+ 1
- 1
mallinkPosApi/src/main/java/com/iformall/controller/PosController.java View File

@@ -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(必填)\"}")


+ 2
- 1
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java View File

@@ -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;
}



+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMall.java View File

@@ -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")


+ 3
- 0
mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java View File

@@ -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";


+ 2
- 1
mallinkService/src/main/resources/mapper/WxMallMapper.xml View File

@@ -22,6 +22,7 @@
<result column="img_qrcode_wemp" jdbcType="VARCHAR" property="imgQrcodeWemp"/>
<result column="weapp_share_title" jdbcType="VARCHAR" property="weappShareTitle"/>
<result column="weapp_share_cover_img" jdbcType="VARCHAR" property="weappShareCoverImg"/>
<result column="pos_qrcode_rule" jdbcType="VARCHAR" property="posQrcodeRule"/>
<result column="sale_type" jdbcType="TINYINT" property="saleType"/>
<result column="valid_start" jdbcType="TIMESTAMP" property="validStart"/>
<result column="valid_end" jdbcType="TIMESTAMP" property="validEnd"/>
@@ -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`
</sql>



Loading…
Cancel
Save