czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

This commit is contained in:
Tankaikai 2024-10-29 14:29:06 +08:00
parent 16e57907ba 4f2e4e7f2e
commit c438c7f250
7 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
View File

@ -75,6 +75,7 @@ public class MemberController {
try {
return memberService.memberAccountPay(map, token);
} catch (Exception e) {
log.error("》》》》》》》》》》账户支付异常：",e);
e.printStackTrace();
}
return Result.fail(CodeEnum.SYS_EXCEPTION);

2
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java
View File

@ -673,7 +673,7 @@ public class PrintMechineConsumer {
}
FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark);
FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo, DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark);
}
});
}

2
src/main/java/com/chaozhanggui/system/cashierservice/rabbit/print/FeiPrinter.java
View File

@ -69,7 +69,7 @@ public class FeiPrinter extends PrinterHandler {
return;
}
String remark = sku.getSpecSnap();
String[] resp = FeieyunPrintUtil.getPrintData(machine.getAddress(), orderInfo.getMasterId(),
String[] resp = FeieyunPrintUtil.getPrintData(machine.getAddress(), orderInfo,
DateUtils.getTime(new Date(orderInfo.getCreatedAt())), orderDetail.getProductName(), orderDetail.getNum(), remark);
shopPrintLogService.save(machine, "新订单", resp[0], resp[1]);
}

6
src/main/java/com/chaozhanggui/system/cashierservice/service/CloudPrinterService.java
View File

@ -262,7 +262,7 @@ public class CloudPrinterService {
if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) {
remark = tbProductSkuWithBLOBs.getSpecSnap();
}
OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(),it.getPrice()).toPlainString(), remark);
OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(), it.getPrice()).toPlainString(), remark);
detailList.add(detail);
});
@ -397,7 +397,7 @@ public class CloudPrinterService {
if (ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs) && ObjectUtil.isNotEmpty(tbProductSkuWithBLOBs.getSpecSnap())) {
remark = tbProductSkuWithBLOBs.getSpecSnap();
}
OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(),it.getPrice()).toPlainString(), remark);
OrderDetailPO.Detail detail = new OrderDetailPO.Detail(it.getProductName(), it.getNum().toString(), NumberUtil.mul(it.getNum(), it.getPrice()).toPlainString(), remark);
detailList.add(detail);
});
@ -527,7 +527,7 @@ public class CloudPrinterService {
remark = tbProductSkuWithBLOBs.getSpecSnap();
}
FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo.getMasterId(), DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark);
FeieyunPrintUtil.getPrintData(tbPrintMachineWithBLOBs.getAddress(), orderInfo, DateUtils.getTime(new Date(orderInfo.getCreatedAt())), it.getName(), it.getNumber(), remark);
}
});
}

3
src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
View File

@ -742,7 +742,7 @@ public class MemberService {
JSONObject baObj = new JSONObject();
baObj.put("userId", shopUser.getUserId());
baObj.put("shopId", shopInfo.getId());
baObj.put("amount", ObjectUtil.isNull(fl) ? amount : amount.add(fl.get()));
baObj.put("amount", ObjectUtil.isNull(fl.get()) ? amount : amount.add(fl.get()));
baObj.put("balance", shopUser.getAmount());
baObj.put("type", "充值");
baObj.put("time", flow.get().getCreateTime());
@ -877,5 +877,4 @@ public class MemberService {
}
}

4
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -798,7 +798,9 @@ public class OrderService {
orderDetail = new TbOrderDetail();
// 已经加入修改了库存数量，返还或减少库存
addOrderDetailList.add(orderDetail);
productService.decrStock(cashierCart.getProductId(), cashierCart.getSkuId(), cashierCart.getNumber());
if (!TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) {
productService.decrStock(cashierCart.getProductId(), cashierCart.getSkuId(), cashierCart.getNumber());
}
} else {
if (!TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) {
int subVal = cashierCart.getNumber() - orderDetail.getNum();

25
src/main/java/com/chaozhanggui/system/cashierservice/util/FeieyunPrintUtil.java
View File

@ -8,6 +8,8 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.chaozhanggui.system.cashierservice.bean.OrderUseTypeEnum;
import com.chaozhanggui.system.cashierservice.entity.TbOrderInfo;
import com.chaozhanggui.system.cashierservice.entity.po.CallNumPrintPO;
import com.chaozhanggui.system.cashierservice.model.OrderDetailPO;
import lombok.extern.slf4j.Slf4j;
@ -120,23 +122,22 @@ public class FeieyunPrintUtil {
public static String buildPrintContent(String pickupNumber, String date, String productName, Integer number, String remark) {
StringBuilder builder = new StringBuilder();
builder.append("<CB>" + pickupNumber + "</CB><BR><BR>");
builder.append("<L>时间: " + date + " </L><BR><BR><BR>");
remark = StrUtil.emptyToDefault(remark, "");
if (productName.length() > 4 || remark.length() > 4) {
builder.append("<B><BOLD>" + productName + " x " + number + "</BOLD></B><BR><BR>");
builder.append("<B><BOLD>" + productName + " x " + number + "</BOLD></B><BR><BR>");
builder.append("<B><BOLD>" + remark + " </BOLD></B><BR>");
} else {
builder.append("<B><BOLD>" + productName + " x " + number + "</BOLD></B><BR><BR>");
builder.append("<B><BOLD>" + productName + " x " + number + "</BOLD></B><BR><BR>");
builder.append("<B><BOLD>" + remark + " </BOLD></B><BR>");
}
builder.append("<CUT>");
return builder.toString();
}
public static String[] getPrintData(String sn, String pickupNumber, String date, String productName, Integer number, String remark) {
String content = buildPrintContent(pickupNumber, date, productName, number, remark);
public static String[] getPrintData(String sn, TbOrderInfo orderInfo, String date, String productName, Integer number, String remark) {
String content = buildPrintContent(getPickupNum(orderInfo), date, productName, number, remark);
System.out.println("content:".concat(content));
@ -200,6 +201,20 @@ public class FeieyunPrintUtil {
}
private static String getPickupNum(TbOrderInfo orderInfo) {
String pickupNum = "";
if ("miniapp".equals(orderInfo.getOrderType())) {
if (OrderUseTypeEnum.TAKEOUT.getValue().equals(orderInfo.getUseType())) {
pickupNum = orderInfo.getOutNumber();
} else {
pickupNum = orderInfo.getTableName();
}
} else {
pickupNum = orderInfo.getMasterId();
}
return pickupNum;
}
public static String buildPrintContent(OrderDetailPO detailPO, String type, String orderType) {
StringBuffer data = new StringBuffer();
data.append(StrUtil.format("<CB>{}</CB><BR>", detailPO.getMerchantName()));