backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix printer bug

Browse Source
This commit is contained in:
Jack 2024-11-21 00:45:35 +08:00
parent 95d1dace4d
commit 6de92e38fc
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterServiceImpl.java
View File

@ -97,7 +97,7 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
return CommonResult.success(null, "记录不存在！");
}
if(StrUtil.isBlank(user.getStore_id()) || !user.getStore_id().equals(record.getStore_id().toString())){
if (StrUtil.isBlank(user.getStore_id()) || !user.getStore_id().equals(record.getStore_id().toString())) {
return CommonResult.failed("无权限操作!");
}
@ -267,7 +267,16 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
return CommonResult.failed("打票机不存在，无法操作！");
}
if(status.equals(record.getStatus())) {
if (ConstantError.Enable.equals(status)) {
// 向厂家新增打印机
// 格式："922441475#r6ZXPvHH#核销柜台";
feieUtil.addPrinter(String.format("%s#%s#%s", record.getPrinter_sn(), record.getPrinter_key(), record.getPrinter_name()));
} else {
// 向厂家删除打印机
feieUtil.delPrinter(record.getPrinter_sn());
}
if (status.equals(record.getStatus())) {
return CommonResult.success();
}

5
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java
View File

@ -34,8 +34,11 @@ public class ShopStorePrinterTemplateServiceImpl extends BaseServiceImpl<ShopSto
queryWrapper.eq("category", category);
queryWrapper.orderByAsc("template_id");
ShopStorePrinterTemplate shopStorePrinterTemplate = getOne(queryWrapper);
if (shopStorePrinterTemplate == null) {
if (shopStorePrinterTemplate == null || shopStorePrinterTemplate.getTemplate_id() <= 0) {
queryWrapper.clear();
queryWrapper.eq("store_id", 0);// 公共下单模版
queryWrapper.eq("category", category);
queryWrapper.orderByAsc("template_id");
shopStorePrinterTemplate = getOne(queryWrapper);
}

5
mall-shop/src/main/java/com/suisung/mall/shop/store/utis/FeieUtil.java
View File

@ -95,7 +95,7 @@ public class FeieUtil {
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("printerContent", printerInfo));
FeiePrinterApiRes<FeiePrinterApiDataRes> reps = sendHttpPost("Open_printerAddlist", nvps);
logger.info("飞鹅添加打印机返回数据：{}", reps);
if (reps != null && reps.getRet().equals(0)) {
// && reps.getData()!=null && reps.getData().getOk()!=null &&reps.getData().getOk().length>0
return true;
@ -116,6 +116,7 @@ public class FeieUtil {
nvps.add(new BasicNameValuePair("snlist", snList));
FeiePrinterApiRes<FeiePrinterApiDataRes> reps = sendHttpPost("Open_printerDelList", nvps);
logger.info("飞鹅删除打印机返回数据：{}", reps);
if (reps != null && reps.getRet().equals(0)) {
return true;
}
@ -251,7 +252,7 @@ public class FeieUtil {
HttpEntity httpentity = response.getEntity();
if (httpentity != null) {
String result = EntityUtils.toString(httpentity);
logger.info("飞鹅云返回到信息：\n" + result);
logger.debug("飞鹅云返回到信息：{}", result);
return JsonUtil.json2object(result, FeiePrinterApiRes.class);
}
}