更改文字,更改AppGuide字段,实名逻辑更改,收银点判断逻辑更改,RSA相关

This commit is contained in:
liuyingfang
2023-06-06 18:23:13 +08:00
parent eeffe90fc7
commit fd84e2d469
42 changed files with 1433 additions and 91 deletions

View File

@@ -64,8 +64,8 @@ public class DeviceMerchantBuyDTO {
public Map<String, String> convert(String orderNo) {
Map<String, String> result = new HashMap<String, String>(16);
result.put("body", "银收商品订单支付");
result.put("subject", "银收商品订单支付");
result.put("body", "银收商品订单支付");
result.put("subject", "银收商品订单支付");
result.put("outTradeNo", orderNo);
result.put("totalAmount", orderAmount + "");
return result;

View File

@@ -88,5 +88,7 @@ public class AppGuide implements Serializable {
*/
@TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
private Date updateTimeEnd;
@TableField("type")
private String type;
}

View File

@@ -32,7 +32,7 @@ public class DeviceOperateInfoVO extends DeviceOperateInfo {
public String getDesc() {
String type = this.getType();
if(DeviceOperateType.IN.getCode().equals(type)){
this.desc = "银收设备入库";
this.desc = "银收设备入库";
}
if(DeviceOperateType.TRANSFER.getCode().equals(type)){
this.desc = this.getRemark();

View File

@@ -50,7 +50,7 @@ public class DeviceTransferVO extends DeviceTransfer {
public String getUserName() {
if(StringUtil.isEmpty(this.userName)){
this.userName = "银收";
this.userName = "银收";
}
return userName;
}