修改c端的商品实时价格
This commit is contained in:
parent
2c7ef98281
commit
4dc3fcc1e1
@ -436,8 +436,10 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl<ShopPageBaseMapper,
|
||||
Optional<Map> product_item_opl = product_item_rows.stream().filter(s -> ObjectUtil.equal(Convert.toLong(s.get("item_id")), did)).findFirst();
|
||||
if (product_item_opl.isPresent()) {
|
||||
Map product_item_row = product_item_opl.get();
|
||||
BigDecimal itemSalePrice = Convert.toBigDecimal(((JSONObject) item).get("ItemSalePrice"));
|
||||
//BigDecimal itemSalePrice = Convert.toBigDecimal(((JSONObject) item).get("ItemSalePrice"));
|
||||
BigDecimal item_unit_price = Convert.toBigDecimal(product_item_row.get("item_unit_price"));
|
||||
BigDecimal itemSalePrice = item_unit_price; //显示为 商品SKU单价
|
||||
|
||||
BigDecimal item_unit_points = Convert.toBigDecimal(product_item_row.get("item_unit_points"));
|
||||
BigDecimal item_unit_sp = Convert.toBigDecimal(product_item_row.get("item_unit_sp"));
|
||||
|
||||
|
||||
@ -69,18 +69,6 @@ public interface ShopStorePrinterService extends IBaseService<ShopStorePrinter>
|
||||
*/
|
||||
CommonResult clearPrinterQueue(String printer_sn);
|
||||
|
||||
/**
|
||||
* 测试打印订单
|
||||
* @return
|
||||
*/
|
||||
CommonResult printOrderInfo();
|
||||
|
||||
/**
|
||||
* 测试打印订单
|
||||
* @return
|
||||
*/
|
||||
CommonResult printOrderInfo2();
|
||||
|
||||
/**
|
||||
* 支付成功后,立即打印门店的订单信息
|
||||
* @param orderId
|
||||
|
||||
@ -1,41 +1,18 @@
|
||||
package com.suisung.mall.shop.store.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.suisung.mall.common.api.CommonResult;
|
||||
import com.suisung.mall.common.api.StateCode;
|
||||
import com.suisung.mall.common.constant.ConstantError;
|
||||
import com.suisung.mall.common.domain.UserDto;
|
||||
import com.suisung.mall.common.modules.store.ShopStorePrinter;
|
||||
import com.suisung.mall.common.modules.store.ShopStorePrinterLog;
|
||||
import com.suisung.mall.common.modules.store.ShopStorePrinterTemplate;
|
||||
import com.suisung.mall.common.pojo.vo.ShopStoreOrderProductPrintVO;
|
||||
import com.suisung.mall.common.pojo.vo.ShopStorePrinterVO;
|
||||
import com.suisung.mall.common.utils.DateTimeUtils;
|
||||
import com.suisung.mall.common.utils.FreeMakerUtils;
|
||||
import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
|
||||
import com.suisung.mall.shop.order.service.ShopOrderBaseService;
|
||||
import com.suisung.mall.shop.store.mapper.ShopStorePrinterLogMapper;
|
||||
import com.suisung.mall.shop.store.mapper.ShopStorePrinterMapper;
|
||||
import com.suisung.mall.shop.store.service.ShopStorePrinterLogService;
|
||||
import com.suisung.mall.shop.store.service.ShopStorePrinterService;
|
||||
import com.suisung.mall.shop.store.service.ShopStorePrinterTemplateService;
|
||||
import com.suisung.mall.shop.store.utis.FeieUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
|
||||
import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Service
|
||||
|
||||
@ -14,9 +14,7 @@ import com.suisung.mall.common.domain.UserDto;
|
||||
import com.suisung.mall.common.modules.store.ShopStorePrinter;
|
||||
import com.suisung.mall.common.modules.store.ShopStorePrinterLog;
|
||||
import com.suisung.mall.common.modules.store.ShopStorePrinterTemplate;
|
||||
import com.suisung.mall.common.pojo.vo.ShopStoreOrderProductPrintVO;
|
||||
import com.suisung.mall.common.pojo.vo.ShopStorePrinterVO;
|
||||
import com.suisung.mall.common.utils.DateTimeUtils;
|
||||
import com.suisung.mall.common.utils.FreeMakerUtils;
|
||||
import com.suisung.mall.common.utils.JsonUtil;
|
||||
import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
|
||||
@ -33,9 +31,10 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.util.Pair;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser;
|
||||
|
||||
@ -289,82 +288,6 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public CommonResult printOrderInfo() {
|
||||
|
||||
String sn = "922441475";
|
||||
|
||||
ShopStoreOrderProductPrintVO order1 = new ShopStoreOrderProductPrintVO("可口可乐CocaCola经典美味汽水1.25L/瓶", 110, new BigDecimal("8100.45"), "6970448170051");
|
||||
ShopStoreOrderProductPrintVO order2 = new ShopStoreOrderProductPrintVO("排骨约350g(默认砍小块)", 1, new BigDecimal("150.13"), "6970448170051");
|
||||
ShopStoreOrderProductPrintVO order3 = new ShopStoreOrderProductPrintVO("新鲜虫草花1包约200g 韭菜1000g 鸡蛋2003克", 11, new BigDecimal("4.01"), "6970448170051");
|
||||
ShopStoreOrderProductPrintVO order4 = new ShopStoreOrderProductPrintVO("冰红茶风味饮料", 1, new BigDecimal("13.24"), "6970448170051");
|
||||
List<ShopStoreOrderProductPrintVO> productList = new ArrayList<>();
|
||||
productList.add(order1);
|
||||
productList.add(order2);
|
||||
productList.add(order3);
|
||||
productList.add(order4);
|
||||
|
||||
String productsStr = feieUtil.genProductStr(productList, 18, 6, 8);
|
||||
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
String currentDateTime = DateTimeUtils.formatDateTime(now, "yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
String cont = "<CB>小发同城</CB><BR>" +
|
||||
"--------------------------------<BR>" +
|
||||
// cont.append("<CB>#000"+DateTimeUtils.formatDateTime(now,"ddHHmm")+"</CB><BR>");
|
||||
// cont.append("<L>买家备注:不用敲门,放在门口旁边的外卖箱,打个电话告知送达就行,谢谢!!!</L><BR>");
|
||||
// cont.append("<BOLD>配送时间:2024-10-25 14:00-14:30</BOLD><BR>");
|
||||
// cont.append("--------------------------------<BR>");
|
||||
// cont.append("订单编号:ES20231026111444527685<BR>");
|
||||
// cont.append("订单来源:微信小程序<BR>");
|
||||
// cont.append("支付方式:微信支付<BR>");
|
||||
// cont.append("配送来源:顺丰同城<BR>");
|
||||
// cont.append("付款时间:"+currentDateTime+"<BR>");
|
||||
// cont.append("--------------------------------<BR>");
|
||||
|
||||
// 商品列表
|
||||
productsStr;
|
||||
|
||||
// cont.append("--------------------------------<BR>");
|
||||
// cont.append("商品总件数:<BOLD>3</BOLD><BR>");
|
||||
// cont.append("商品总额:<BOLD>¥18.7</BOLD><BR>");
|
||||
// cont.append("押金:<BOLD>¥500</BOLD><BR>");
|
||||
// cont.append("运费:<BOLD>¥5.54</BOLD><BR>");
|
||||
// cont.append("会员权益:<BOLD>-¥50</BOLD><BR>");
|
||||
// cont.append("秒杀:<BOLD>-¥100</BOLD><BR>");
|
||||
// cont.append("实付金额:<BOLD>¥428.9元</BOLD><BR>");
|
||||
// cont.append("--------------------------------<BR>");
|
||||
// cont.append("<BOLD>商家备注:老顾客赠送一箱牛奶;玻璃瓶包装轻拿轻放!</BOLD><BR>");
|
||||
// cont.append("--------------------------------<BR>");
|
||||
// cont.append("<BOLD>收货人:张三</BOLD><BR>");
|
||||
// cont.append("<BOLD>收货人手机:13128778765</BOLD><BR>");
|
||||
// cont.append("<BOLD>收货地址:北京市朝阳区朝阳路朝阳人民小区1号楼1栋1101</BOLD><BR>");
|
||||
// cont.append("--------------------------------<BR>");
|
||||
// cont.append("门店:岛内价生活超市<BR>");
|
||||
// cont.append("门店电话:<BOLD>13665822542</BOLD><BR>");
|
||||
// cont.append("收银员:李小璐<BR>");
|
||||
|
||||
feieUtil.printContent(sn, cont);
|
||||
|
||||
return CommonResult.success();
|
||||
}
|
||||
|
||||
@Override
|
||||
public CommonResult printOrderInfo2() {
|
||||
ShopStorePrinterTemplate template = shopStorePrinterTemplateService.getShopStorePrinterTemplateInner(1, 1);
|
||||
|
||||
Map<String, Object> binding = new HashMap<>();
|
||||
binding.put("store_name", "小发同城商城");
|
||||
binding.put("sn", "922441475");
|
||||
|
||||
String sn = "922441475";
|
||||
String cont = FreeMakerUtils.processTemplate(template.getTemplate_name(), template.getTemplate_value(), binding);
|
||||
|
||||
// feieUtil.printContent(sn, cont);
|
||||
|
||||
return CommonResult.success(cont);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean printShopStoreOrder(String orderId) {
|
||||
@ -421,19 +344,12 @@ public class ShopStorePrinterServiceImpl extends BaseServiceImpl<ShopStorePrinte
|
||||
return false;
|
||||
}
|
||||
|
||||
// String repsNo = feieUtil.printContent(printerList.get(0).getPrinter_sn(), printContent);
|
||||
// if (StrUtil.isBlank(repsNo)) {
|
||||
// logger.info("订单{}信息打印,调用飞鹅打印机打印失败。", orderId);
|
||||
// return false;
|
||||
// }
|
||||
|
||||
for (Pair<String, String> respSn : respList) {
|
||||
// 打印成功,新增打印日志记录,以备下次查看和打印
|
||||
ShopStorePrinterLog shopStorePrinterLog = new ShopStorePrinterLog(template.getCategory(), storeId, orderId, template.getTemplate_id(), template.getTemplate_value(), JsonUtil.object2json(binding), printContent, respSn.getSecond(), respSn.getFirst());
|
||||
shopStorePrinterLogService.insertShopStorePrinterLog(shopStorePrinterLog);
|
||||
}
|
||||
|
||||
|
||||
logger.debug("#### 调用飞鹅打票机的打印操作结束 ####");
|
||||
|
||||
return true;
|
||||
|
||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user