From 71df91b54a33b8a7739ff962eb381a7f4d2cbda2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Tue, 4 Jun 2024 16:32:09 +0800 Subject: [PATCH 01/10] =?UTF-8?q?pos=E6=94=AF=E4=BB=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CardFuelRecordServiceImpl.java | 11 +++++++++++ .../controller/CardValueOrdersController.java | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index 78fa5bba3..3e442ec69 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -32,6 +32,8 @@ import com.fuint.business.marketingActivity.cardFuleOrders.service.CardFuleOrder import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper; import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; +import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; +import com.fuint.business.marketingActivity.cardValueOrders.mapper.CardValueOrdersMapper; import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService; import com.fuint.business.member.entity.LJStaff; import com.fuint.business.member.service.ILJStaffService; @@ -53,6 +55,7 @@ import com.fuint.business.userManager.vo.LJUserVo; import com.fuint.common.util.RedisLock; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @@ -269,6 +272,12 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { if ("CASH".equals(cardFuelRecordDTO.getPaymentType())) { AllOrderInfo allOrderInfo = getAllOrderInfo(cardFuelRecordDTO); allOrderInfoService.insertAllOrderInfo(allOrderInfo); + CardValueOrders cardValueOrders = new CardValueOrders(); + BeanUtils.copyProperties(allOrderInfo, cardValueOrders); + cardValueOrders.setPayAmount(allOrderInfo.getPayMoney()); + cardValueOrders.setDiscount(allOrderInfo.getDiscountAmount()); + cardValueOrders.setAmount(allOrderInfo.getPayMoney()); + cardValueOrdersMapper.insert(cardValueOrders); cardValueOrdersService.updateBalances(orderNo,"paid"); } @@ -317,6 +326,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { return cardFuelRecordDTO; } + @Resource + private CardValueOrdersMapper cardValueOrdersMapper; private static AllOrderInfo getAllOrderInfo(CardFuelRecordDTO cardFuelRecordDTO) { AllOrderInfo allOrderInfo = new AllOrderInfo(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java index 75020d71c..60cbd3230 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java @@ -116,15 +116,15 @@ public class CardValueOrdersController extends BaseController { @PostMapping("getOneByOrderNo") - public void getOneByOrderNo(@RequestBody Map map){ + public ResponseObject getOneByOrderNo(@RequestBody Map map){ String orderNo = map.get("orderNo"); - cardValueOrdersService.getOneByOrderNo(orderNo); + return getSuccessResult(cardValueOrdersService.getOneByOrderNo(orderNo)); } - @PostMapping("getOneByOrderNos") + /*@PostMapping("getOneByOrderNos") public ResponseObject getOneByOrderNos(@RequestBody Map map){ String orderNo = map.get("orderNo"); return getSuccessResult(cardValueOrdersService.getOneByOrderNos(orderNo)); - } + }*/ } From ebbc5dd4c94cd92c0e3bd0f037fee972729821fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 5 Jun 2024 09:32:34 +0800 Subject: [PATCH 02/10] bug --- .../views/cashier/NewComponents/homeindex.vue | 72 ++++++++++--------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index ee6badc05..6f6fa281a 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -3196,53 +3196,55 @@ _this.paymentActive.oilId = item.oilName _this.paymentActive.storeId = item.storeId - getPaymentActive(_this.paymentActive).then(res => { + getPaymentActive(_this.paymentActive).then(async res => { item.activeId = res.data.activeId item.type = res.data.type - let discount = {type:"",discount:0,oilName:item.oilName,gunName:item.gunName} - let oilData = {oilName:item.oilName,oilPreferential: {}} + let discount = { type: "", discount: 0, oilName: item.oilName, gunName: item.gunName } + let oilData = { oilName: item.oilName, oilPreferential: {} } // this.preferentialData1 = res.data oilData.oilPreferential = res.data _this.oilPreferentialData.push(oilData) // if (_this.consumeRefuelMoney==0){ - if (res.data.memberFavorableAmount){ - discount.discount = res.data.memberFavorableAmount - _this.gradeDiscount.push(discount) - if(!this.isOilStorageCard) { - _this.oilDiscount = res.data.memberFavorableAmount - _this.checkAll2 = true - this.checkedCities2.push(discount.gunName) - } + if (res.data.memberFavorableAmount) { + discount.discount = res.data.memberFavorableAmount + _this.gradeDiscount.push(discount) + if (!this.isOilStorageCard) { + _this.oilDiscount = res.data.memberFavorableAmount + _this.checkAll2 = true + this.checkedCities2.push(discount.gunName) } - if (res.data.cardFavorableAmount){ - discount.discount = res.data.cardFavorableAmount - _this.couponDiscount.push(discount) - if(!this.isOilStorageCard) { - _this.cardFavorableId = res.data.cardFavorableId - _this.recordId = res.data.recordId - _this.couponAmount = res.data.cardFavorableAmount - _this.checkAll5 = true - } + } + if (res.data.cardFavorableAmount) { + discount.discount = res.data.cardFavorableAmount + _this.couponDiscount.push(discount) + if (!this.isOilStorageCard) { + _this.cardFavorableId = res.data.cardFavorableId + _this.recordId = res.data.recordId + _this.couponAmount = res.data.cardFavorableAmount + _this.checkAll5 = true } - if (res.data.activeFavorableAmount){ - discount.discount = res.data.activeFavorableAmount - discount.type = res.data.type - _this.fullReduceDiscount.push(discount) - if(!this.isOilStorageCard) { - _this.fullReduction = res.data.activeFavorableAmount - _this.checkAll1 = true - this.checkedCities1.push(discount.gunName) - } + } + if (res.data.activeFavorableAmount) { + discount.discount = res.data.activeFavorableAmount + discount.type = res.data.type + _this.fullReduceDiscount.push(discount) + if (!this.isOilStorageCard) { + _this.fullReduction = res.data.activeFavorableAmount + _this.checkAll1 = true + this.checkedCities1.push(discount.gunName) } + } // } - if(this.isOilStorageCard){ - this.countAmountFull() + console.log(_this.oilDiscount, 111) + this.countAmountFull() + if (this.isOilStorageCard) { + await this.countAmountFull() } - if (type==1){ - this.countAmountUnBalance() + if (type == 1) { + await this.countAmountUnBalance() } - if (type==0){ - this.countAmountFull() + if (type == 0) { + await this.countAmountFull() } }) }) From fe788d418a56c6ec15d427625e801f01a000885a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 5 Jun 2024 11:51:31 +0800 Subject: [PATCH 03/10] =?UTF-8?q?pos=E6=94=AF=E4=BB=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/member/utils/QrCodeUtils.java | 90 ++++++++---------- .../tag/service/impl/TagCodeServiceImpl.java | 24 +---- .../resources/static/qrCodeImg/white2.jpg | Bin 0 -> 4747 bytes 3 files changed, 43 insertions(+), 71 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/white2.jpg diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java index 70629ebca..129fc7dd8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java @@ -129,6 +129,47 @@ public class QrCodeUtils { } } + public void createLogoCodePictures(String tagCodeSn,InputStream logoStream, String url, String outImgPath, Integer staffId, Integer storeId,String urls) { + try { + Image srcImg = ImageIO.read(logoStream); + //获取图片的宽 + int srcImgWidth = srcImg.getWidth(null); + //获取图片的高 + int srcImgHeight = srcImg.getHeight(null); + BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB); + Graphics2D g = bufImg.createGraphics(); + g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null); + //使用工具类生成二维码 + Image image = createQrCode(null, url, 360, 360); + //将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。 + g.drawImage(image, (bufImg.getWidth()-360)/2, (bufImg.getHeight()-360)/2-30, null); + // 设置字体，样式，字体大小 +// g.setFont(new Font("TimesRoman", Font.BOLD, 40)); + g.setFont(chineseFont()); + //设置颜色。 + g.setColor(Color.BLACK); + g.drawString("SN："+tagCodeSn, returnX(g, bufImg.getWidth(), "SN："+tagCodeSn), 440); + g.dispose(); + // 输出图片 + String urlsss = "/temp/qrCode/"; + if (ObjectUtils.isNotEmpty(urls)){ + urlsss = urls; + } + File file1 = new File(urlsss); + // 判断目录是否存在 + if (!file1.exists()) { + file1.mkdirs(); + } + + FileOutputStream outImgStream = new FileOutputStream(outImgPath); + ImageIO.write(bufImg, "jpg", outImgStream); + outImgStream.flush(); + outImgStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + public void createLogoCodePictureByPos(InputStream backgroundStream, InputStream logoStream, String url, String outImgPath, Integer staffId, Integer storeId,String urls) { try { // 读取原图片信息 @@ -166,56 +207,7 @@ public class QrCodeUtils { } } - public void createLogoCodePictures(InputStream logoStream, String url, String outImgPath, Integer staffId, Integer storeId,String urls) { - try { - // 读取原图片信息 - //得到文件 -//// File file = ResourceUtils.getFile(roundImage); -// ClassPathResource resource = new ClassPathResource(roundImage); -// ClassPathResource logoResource = new ClassPathResource(logoImage); -// File file = resource.getFile(); - //文件转化为图片 - // 加水印 - //使用工具类生成二维码 - Image image = createQrCode(logoStream, url, 360, 360); - //将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。 - -// 查询当前店铺信息 - if (ObjectUtils.isNotEmpty(storeId)){ - LJStore store = storeService.selectStoreByStoreId(storeId); -// 查询加油员信息 - LJStaff staff = null; - if (ObjectUtil.isNotEmpty(staffId)){ - staff = staffService.selectStaffById(staffId); - } - LJStaff staff1 = staffService.selectStaffByStoreId(storeId); - }else { - //drawStringWithMultiLine(g,"欢迎光临", bufImg.getWidth()-20,20,940,10 ); - } - - -// // 将码牌编号文字绘制到指定位置 -// g.drawString(storeNumber, 200, 800); - // 输出图片 - String urlsss = "/temp/qrCode/"; - if (ObjectUtils.isNotEmpty(urls)){ - urlsss = urls; - } - File file1 = new File(urlsss); - // 判断目录是否存在 - if (!file1.exists()) { - file1.mkdirs(); - } - - FileOutputStream outImgStream = new FileOutputStream(outImgPath); - ImageIO.write((RenderedImage) image, "jpg", outImgStream); - outImgStream.flush(); - outImgStream.close(); - } catch (Exception e) { - e.printStackTrace(); - } - } public Font chineseFont() throws Exception { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeServiceImpl.java index eeee35a1a..5d6ecba99 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/service/impl/TagCodeServiceImpl.java @@ -59,8 +59,6 @@ public class TagCodeServiceImpl extends ServiceImpl impl @Autowired private BackendFileController backendFileController; - //private static final String IMAGE_DIRECTORY = "D:\\temp\\qrCode"; - @Override @Transactional public ResponseEntity add(TagCodeDTO tagCodeDTO, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -74,29 +72,21 @@ public class TagCodeServiceImpl extends ServiceImpl impl for (int i = 0; i < total; i++) { Random random = new Random(); int i1 = random.nextInt(90000000); - //String url = "https://oil.youkerr.com/"; String url = "https://www.tuofeng.cc/oilRefuel?sn=byx"+i1; - // String finalPath="/temp/qrCode/" + oilTag.getSnCode() + ".jpg"; - //String finalPath="D:\\office\\document\\photos\\tagCode\\"+"str"+i+".jpg"; - //String finalPath="/temp/tagCode/" + "byx"+i1 + ".jpg"; - //String finalPath="/temp/tagCode/"+ DateUtil.formatDate(new Date(), "yyyyMMdd") + "/"+i2 + "byx"+i1 + ".jpg"; TagCode tagCode = new TagCode(); tagCode.setCollection(url); tagCode.setTagCodeSn("byx"+i1); tagCode.setDeptId(Integer.parseInt(nowAccountInfo.getDeptId().toString())); - //在图片上生成二维码 - String backgroundImage = "static/qrCodeImg/huanyingguanglin.jpg"; + String backgroundImage = "static/qrCodeImg/white2.jpg"; InputStream backgroundStream = this.getClass().getClassLoader().getResourceAsStream(backgroundImage); String urls = ""; urls = "/temp/tagCode/"+ DateUtil.formatDate(new Date(), "yyyyMMdd") + "-"+i2; File file1 = new File(urls); - // String finalPath="/temp/tagCode/" + "byx"+i1 + ".jpg"; String finalPath=urls+"/" + "byx"+i1 + ".jpg"; - qrCodeUtils.createLogoCodePictures(null, url, finalPath, null,null,urls); - + qrCodeUtils.createLogoCodePictures(tagCode.getTagCodeSn(),backgroundStream, url, finalPath, null,null,urls); // 判断目录是否存在 if (!file1.exists()) { @@ -105,17 +95,13 @@ public class TagCodeServiceImpl extends ServiceImpl impl File file =new File(finalPath); FileInputStream fileInputStream =new FileInputStream(file); - // FileInputStream fileInputStream =new FileInputStream(file1); MultipartFile resFile = new MockMultipartFile("file", file.getName(), null, fileInputStream); // 返回图片路径 String saveFile = backendFileController.saveFile(resFile); - //return saveFile; tagCode.setImageUrl(saveFile); flag = save(tagCode); } - //导出码牌 - //String IMAGE_DIRECTORY = "D:\\temp\\tagCode\\"+DateUtil.formatDate(new Date(), "yyyyMMdd")+"-"+i2; String IMAGE_DIRECTORY = "/temp/tagCode/"+DateUtil.formatDate(new Date(), "yyyyMMdd")+"-"+i2; List imageFiles = getImageFiles(IMAGE_DIRECTORY); @@ -135,12 +121,6 @@ public class TagCodeServiceImpl extends ServiceImpl impl return ResponseEntity.ok() .body(new InputStreamResource(inputStream)); } - - - //String IMAGE_DIRECTORY = "D:\\temp\\qrCode\\DateUtil.formatDate(new Date(), \"yyyyMMdd\") +"; - - - //return flag; } diff --git a/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/white2.jpg b/fuintBackend/fuint-application/src/main/resources/static/qrCodeImg/white2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fb5148b19c26ee1b28b67f54061d3e510b5c542a GIT binary patch literal 4747 zcmex=&w6?W(baqXeJZ0*%=`&`|TC{k{ z(q+q6tX#Ee^OmjKw(r=v>(JpNM~@vpaq`rq%U7;myME*5t%r{uKY9A>`HPpYK7RWA zWX5a=%^78Yg}c96dqnaY8fS&)TQ(U48ZF_1m6P*};R zkwe63;=+vwIhBorK8Pk2UE~r|F?p!^5#%+n&xrF_6Inikdko>PTMRtRjKIia7G$tz z`1em^Q5VA~9u0%hG%%V5M$^D(8W>FjqiJ9?4UDFN(KIlc21e7sXc`zz1H(HF{J*)w b>$^Q@bmL<*f0p-K-vw?G!dhD%7ij|k@8%Yo literal 0 HcmV?d00001 From ee406cd0d483104613ef535f242bc79cf9528469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 5 Jun 2024 13:37:21 +0800 Subject: [PATCH 04/10] bug --- fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue | 4 ++-- pos-uni/pagesHome/Collection/Collection.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 6f6fa281a..069735c3f 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -3379,7 +3379,7 @@ }else { this.oilActualPay = this.oilAmount.toFixed(2) } - console.log("不使用囤油卡",this.oilAmount, this.oilDiscount,this.couponAmount,this.fullReduction,this.oilCardAmount) + console.log("不使用囤油卡", this.consumeAmount ,this.oilAmount, this.oilDiscount,this.couponAmount,this.fullReduction,this.oilCardAmount) }, // 不使用储值卡 countAmountUnBalance(){ @@ -3895,7 +3895,7 @@ } }) // oilCardAmount - if (flag) amount = item.oilPrice * item.liters + if (flag) amount = item.amount oilAmount += amount }) if (oilAmount>0) this.oilCardAmount = this.oilAmount - oilAmount diff --git a/pos-uni/pagesHome/Collection/Collection.vue b/pos-uni/pagesHome/Collection/Collection.vue index 48fbf01b7..2c435de1d 100644 --- a/pos-uni/pagesHome/Collection/Collection.vue +++ b/pos-uni/pagesHome/Collection/Collection.vue @@ -553,7 +553,7 @@ getspearIndex(num, data) { this.spearIndex = num this.oilGunNum = data.id - this.oils = data.oilName + this.oilName = data.oilName this.tankId = data.tankId this.oilPrice = data.oilPrice this.getPaymentPreferential() From 7c5c6a7088327a0486c8bf9d6c8e1ddebd55f07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 5 Jun 2024 14:47:06 +0800 Subject: [PATCH 05/10] =?UTF-8?q?pos=E6=94=AF=E4=BB=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fuint/api/fuyou/entity/Const.java | 8 ++++---- .../service/impl/CardValueOrdersServiceImpl.java | 2 +- fuintBackend/pom.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java index 956fba457..6272d86a7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java @@ -49,13 +49,13 @@ public class Const { public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB"; //小程序异步通知(回调地址) -// public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify"; + public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify"; // public static String notify_url = "http://k40180f897.goho.co/api/fyPay/notify"; - public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; + // public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; //主扫异步通知(回调地址) -// public static String notify_url_scan = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notifyScan"; - public static String notify_url_scan = "https://8q4f124343.yicp.fun/api/fyPay/notifyScan"; + public static String notify_url_scan = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notifyScan"; + //public static String notify_url_scan = "https://8q4f124343.yicp.fun/api/fyPay/notifyScan"; //主扫下单 public static String fuiou_21_url = "https://fundwx.fuiou.com/preCreate"; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java index 06a5dc9c5..9f5e8046d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java @@ -94,7 +94,7 @@ public class CardValueOrdersServiceImpl extends ServiceImpl1.4.19 - + yly_sdk From a89a6c5c2745b466c224c6df05c30d5fc945df0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 5 Jun 2024 15:18:27 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF?= =?UTF-8?q?=E4=BB=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CardValueRecordServiceImpl.java | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index 4211b524f..84c56b507 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -170,11 +170,17 @@ public class CardValueRecordServiceImpl extends ServiceImpl= cardValue.getRechargeBalance()){ cardValueOrders.setGiftBalance(cardValue.getGiftBalance()); + cardValueOrders.setPoints(cardValue.getPoints()); + cardValueOrders.setGrowthValue(cardValue.getGrowthValue()); + }else { + cardValueOrders.setGiftBalance(0.0); + cardValueOrders.setPoints(0); + cardValueOrders.setGrowthValue(0); } - cardValueOrders.setPoints(cardValue.getPoints()); - cardValueOrders.setGrowthValue(cardValue.getGrowthValue()); + cardValueOrders.setAmount(cardValueRecordDTO.getBalance() + cardValueOrders.getGiftBalance()); + cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance()); if (ObjectUtils.isNotEmpty(cardValue.getFringeBenefit())){ cardValueOrders.setFringeBenefit(cardValue.getFringeBenefit()); } @@ -201,20 +207,6 @@ public class CardValueRecordServiceImpl extends ServiceImpl Date: Wed, 5 Jun 2024 15:19:29 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF?= =?UTF-8?q?=E4=BB=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gasStation-uni/pagesRefuel/orderDetail/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue index 3646020c6..02d8cbb47 100644 --- a/gasStation-uni/pagesRefuel/orderDetail/index.vue +++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue @@ -385,7 +385,7 @@ // uni.reLaunch({ // url: '/pagesRefuel/orderSuccess/index' // }) - uni.navigateTo({ + uni.redirectTo({ url: '/pagesRefuel/orderSuccess/index?orderNo=' + _this.orderNo, }) return; @@ -426,10 +426,10 @@ // console.log(res); // }) // uni.reLaunch({ - // url: '/pagesRefuel/orderSuccess/index' + // }) - uni.navigateTo({ + uni.redirectTo({ url: '/pagesRefuel/orderSuccess/index?orderNo=' + _this .orderNo, }) @@ -472,7 +472,7 @@ // url: '/pagesRefuel/orderSuccess/index' // }) - uni.navigateTo({ + uni.redirectTo({ url: '/pagesRefuel/orderSuccess/index?orderNo=' + _this .orderNo, }) @@ -1063,4 +1063,4 @@ position: fixed; top: 0px; } - \ No newline at end of file + From 7919f73a164465f54588a12bcb7b1fee6375b8ca Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 5 Jun 2024 16:09:45 +0800 Subject: [PATCH 08/10] bug --- fuintAdmin/.env.development | 6 ++---- fuintAdmin_zt/.env.development | 7 +++---- fuintBackend/configure/dev/application.properties | 2 +- fuintBackend/configure/prod/application.properties | 2 +- fuintCashierWeb/.env.development | 4 ++-- .../src/views/cashier/NewComponents/homeindex.vue | 2 +- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development index cbd704ade..cd018f513 100644 --- a/fuintAdmin/.env.development +++ b/fuintAdmin/.env.development @@ -11,8 +11,6 @@ VUE_APP_BASE_API = '/dev-api' VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 -#VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/' -VUE_APP_SERVER_URL = 'http://192.168.31.178:8081' - - +VUE_APP_SERVER_URL = 'http://localhost:8080/' +# http://192.168.0.121:8080/ diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development index e3ad97772..07c1c0763 100644 --- a/fuintAdmin_zt/.env.development +++ b/fuintAdmin_zt/.env.development @@ -11,8 +11,7 @@ VUE_APP_BASE_API = '/dev-api' VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 -VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/' +VUE_APP_SERVER_URL = 'http://localhost:8080/' + # cp端地址 -VUE_PC_SERVER_URL = 'http://47.95.206.185:85/' - - +# VUE_PC_SERVER_URL = 'http://47.95.206.185:85/' diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties index c058ecd5c..d92bd50cc 100644 --- a/fuintBackend/configure/dev/application.properties +++ b/fuintBackend/configure/dev/application.properties @@ -33,7 +33,7 @@ spring.redis.pool.min-idle=0 spring.redis.timeout=5000 # \u7CFB\u7EDF\u540D\u79F0 -system.name = \u84DD\u9CB8\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF +system.name = \u767E\u4E1A\u5174\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF # \u524D\u7AEFh5\u5730\u5740 website.url=https://www.fuint.cn/h5/ diff --git a/fuintBackend/configure/prod/application.properties b/fuintBackend/configure/prod/application.properties index 831ccf035..1687893e5 100644 --- a/fuintBackend/configure/prod/application.properties +++ b/fuintBackend/configure/prod/application.properties @@ -33,7 +33,7 @@ spring.redis.pool.min-idle=0 spring.redis.timeout=5000 # \u7CFB\u7EDF\u540D\u79F0 -system.name = \u84DD\u9CB8\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF +system.name = \u767E\u4E1A\u5174\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF # \u524D\u7AEFh5\u5730\u5740 website.url=https://www.fuint.cn/h5/ diff --git a/fuintCashierWeb/.env.development b/fuintCashierWeb/.env.development index 6f00f4d97..de35a1dc3 100644 --- a/fuintCashierWeb/.env.development +++ b/fuintCashierWeb/.env.development @@ -11,5 +11,5 @@ VUE_APP_BASE_API = '/dev-api' VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 - -VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/' +#VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/' +VUE_APP_SERVER_URL = 'http://localhost:8080/' diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 069735c3f..6c6438cc0 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -734,7 +734,7 @@ @click="recharge(index)">
售价{{ item.rechargeBalance }}元
-
锁价{{ item.lockupPrice }}/升
+
锁价{{ item.lockPrice }}/升
From 8d985addf862255f4328df7479a640bb4d7e8539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 5 Jun 2024 16:29:11 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF?= =?UTF-8?q?=E4=BB=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CardValueOrdersServiceImpl.java | 8 +++++++- .../fuint/business/tag/controller/OilTagController.java | 6 +++++- .../src/main/java/com/fuint/business/tag/vo/OilTagVO.java | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java index 9f5e8046d..33a660fd7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java @@ -11,6 +11,8 @@ import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.service.AllOrderInfoService; import com.fuint.business.order.vo.AllOrderInfoVo; +import com.fuint.business.storeInformation.entity.LJStore; +import com.fuint.business.storeInformation.service.ILJStoreService; import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.service.UserBalanceService; import com.fuint.common.dto.AccountInfo; @@ -36,6 +38,9 @@ public class CardValueOrdersServiceImpl extends ServiceImpl queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(TagCodeRecord::getOilTagId,oilTagId); TagCodeRecord one = tagCodeRecordService.getOne(queryWrapper1); + OilTagVO oilTagVO = new OilTagVO(); BeanUtils.copyProperties(record,oilTagVO); if (ObjectUtils.isNotEmpty(one)){ oilTagVO.setStoreName(one.getStoreName()); + if (ObjectUtils.isNotEmpty(one.getStaffName())){ + oilTagVO.setMtStatus("1"); + oilTagVO.setStaffName(one.getStaffName()); + } } - oilTagVOArrayList.add(oilTagVO); } page1.setRecords(oilTagVOArrayList); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java index 7ca2ff7e2..82ef5b375 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java @@ -9,4 +9,5 @@ import java.io.Serializable; public class OilTagVO extends OilTag implements Serializable { //店铺名字 private String storeName; + private String staffName; } From 2cd37d4337dfdb732d35cce7196ae166363bb357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 5 Jun 2024 16:53:03 +0800 Subject: [PATCH 10/10] bug --- fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 6c6438cc0..7420ef80b 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -2160,7 +2160,7 @@ this.cardFuelDieselForm.type = file.type this.cardFuelDieselForm.chainStorId = file.chainStorId this.cardFuelDieselForm.incomeLitres = file.incomeLitres - this.cardFuelDieselForm.lockupPrice = file.lockupPrice + this.cardFuelDieselForm.lockupPrice = file.lockPrice this.cardFuelDieselForm.cardFuelId = file.id this.cardFuelDieselForm.expireTime = file.expireTime