Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

fuintAdmin/.env.production

@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/fuint-application/'
 VUE_APP_PUBLIC_PATH = '/fuintAdmin/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
+VUE_APP_SERVER_URL = 'https://www.youkerr.com/oilAdmin/'

fuintAdmin/src/layout/components/Sidebar/index.vue

@@ -17,7 +17,7 @@
         style="margin-bottom: 80px;"
       >
         <sidebar-item
-          v-for="(route, index) in sidebarRouters"
+          v-for="(route, index) in sidebarRouters"这
           :key="route.path  + index"
           :item="route"
           :base-path="route.path"

fuintAdmin/src/views/integral/gift/index.vue

@@ -117,7 +117,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="排序" align="center" prop="sort" width="40px"/>
+        <el-table-column label="排序" align="center" prop="sort" width="50px"/>
         <el-table-column label="状态" align="center" prop="status" width="80px">
           <template slot-scope="scope">
             <div slot="reference" class="name-wrapper">

fuintAdmin/src/views/oilConfig/oilPrice/index.vue

@@ -42,8 +42,8 @@
           :data="oilPresetPricesList"
           style="width: auto">
           <el-table-column
-            prop="presetId"
+            type="index"
-            label="任务id"
+            label="序号"
             align="center"
             width="100">
           </el-table-column>

fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue

@@ -54,7 +54,7 @@
                 v-loading="loading"
                 :data="suppliersList"
                 :default-sort="defaultSort">
-        <el-table-column label="id" align="center" prop="id"/>
+        <el-table-column label="序号" align="center" type="index"/>
         <el-table-column label="供应商名称" align="center" prop="supplierName"/>
         <el-table-column label="联系人" align="center" prop="contactPerson" />
         <el-table-column label="联系方式" align="center" prop="contactPhone"/>

fuintAdmin/src/views/setting/print/index.vue

@@ -34,7 +34,7 @@
       </el-row>
 
       <el-table :data="tableData" style="width: 100%">
-      <el-table-column prop="id" label="自增id"></el-table-column>
+      <el-table-column type="index" label="序号"></el-table-column>
       <el-table-column prop="machineCode" label="设备终端号"></el-table-column>
       <el-table-column prop="msign" label="设备密钥"></el-table-column>
       <el-table-column prop="deviceName" label="设备名称"></el-table-column>

fuintAdmin_zt/.env.production

@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/fuint-application/'
 VUE_APP_PUBLIC_PATH = '/oilZt/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
+VUE_APP_SERVER_URL = 'https://www.youkerr.com/oilAdmin/'
 
 # cp端地址
-VUE_PC_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
+VUE_PC_SERVER_URL = 'https://www.youkerr.com/oilAdmin/'

fuintAdmin_zt/src/layout/components/Sidebar/index.vue

@@ -15,7 +15,6 @@
                 :unique-opened="true"
                 :active-text-color="settings.theme"
                 :collapse-transition="false"
-                mode="horizontal "
                 style="margin-bottom: 80px;"
             >
                 <sidebar-item

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/StockStatisticMapper.xml

@@ -34,6 +34,7 @@
                 and mg.status = #{stock.status}
             </if>
         </where>
+        order by st.update_time desc
     </select>
     <select id="selectStockById" resultType="com.fuint.business.convenienceSore.vo.StockStatisticVo"
             parameterType="java.lang.Integer">

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml

@@ -149,6 +149,7 @@
                 and ig.status = #{integralGift.status}
             </if>
         </where>
+        order by ig.sort
     </select>
 
     <!--统计总行数-->

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java

@@ -22,6 +22,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.ImageObserver;
 import java.awt.image.RenderedImage;
 import java.io.*;
 
@@ -67,11 +68,13 @@ public class QrCodeUtils {
             Graphics2D g = bufImg.createGraphics();
             g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
             //使用工具类生成二维码
-            Image image = createQrCode(logoStream, url, 360, 360);
+//            Image image = createQrCode(logoStream, url, 360, 360);
+            Image image = createQrCode(logoStream, url, 270, 270);
             //将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。
-            g.drawImage(image, (bufImg.getWidth()-360)/2, 320, null);
+//            g.drawImage(image, (bufImg.getWidth()-360)/2, 320, null);
+            g.drawImage(image, (bufImg.getWidth()-270)/2, 153, null);
             // 设置字体，样式，字体大小
-//            g.setFont(new Font("TimesRoman", Font.BOLD, 40));
+//            g.setFont(new Font("TimesRoman", Font.BOLD, 20));
             g.setFont(chineseFont());
             //设置颜色。
             g.setColor(Color.BLACK);

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CreditUnitMapper.xml

@@ -24,6 +24,7 @@
                 and cu.contact_mobile  like concat('%',  #{creditUnit.contactMobile}, '%')
             </if>
         </where>
+        order by cu.create_time desc
     </select>
     <select id="selectAllCreditLimit" resultType="java.lang.Double"
             parameterType="com.fuint.business.order.entity.CreditUnit">

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java

@@ -408,8 +408,9 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             ljOrder.setDiscount(goodsDiscount);
             ljOrder.setStaffId(staffId);
             ljOrder.setStatus(payStatus);
-            if (payType.equals("CASH") && ObjectUtil.isNotEmpty(staffId)) {
+            if (payType.equals("CASH")) {
-                staffCommissionService.countStaffCommission(staffId, storeId, goodsAmount, goodsActualPay, "2", orderNo);
+                if (ObjectUtil.isNotEmpty(staffId))
+                    staffCommissionService.countStaffCommission(staffId, storeId, goodsAmount, goodsActualPay, "2", orderNo);
                 ljOrder.setPayTime(new Date());
             }
 //        将商品订单的json数据转换为数组

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilPresetPricesMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultType="com.fuint.business.petrolStationManagement.entity.OilPresetPrices">
         <include refid="selectOilPresetPrices"></include>
         where store_id = #{presetPrices.storeId}
+        order by create_time desc
 
     </select>
 <!--    older by preset_id desc-->

fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java

@@ -60,9 +60,9 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
         //在图片上生成二维码
         String backgroundImage = "";
         if (type.equals("0")){
-            backgroundImage = "static/qrCodeImg/laigeyouhui_bg.jpg";
+            backgroundImage = "static/qrCodeImg/mendian_bg1.png";
         }else {
-            backgroundImage = "static/qrCodeImg/laigeyouhui_bg2.png";
+            backgroundImage = "static/qrCodeImg/mendian_bg2.png";
         }
 
         String logoImage = "static/qrCodeImg/logo.png";

fuintBackend/fuint-application/src/main/resources/application.properties

@@ -1,8 +1,8 @@
 # \u57FA\u672C\u914D\u7F6E
-server.port=8081
+server.port=8080
 env.profile=dev
-#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
+env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
-env.properties.path=D:/code/oilSystem/fuintBackend/configure/
+#env.properties.path=D:/code/oilSystem/fuintBackend/configure/
 #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
 
 # \u6570\u636E\u5E93\u914D\u7F6E

fuintCashierWeb/.env.production

@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/fuint-application/'
 VUE_APP_PUBLIC_PATH = '/fuintCashier/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
+VUE_APP_SERVER_URL = 'https://www.youkerr.com/oilAdmin/'

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -2632,8 +2632,8 @@
         let obj = {};
         let results = _this.unitList
         if (queryString){
-          results = [];
           _this.unitList.forEach(item => {
+            results = [];
             if (item.unitName.includes(queryString)){
               obj = item;
               obj.value = `${item.unitName}（${item.personCredit} ${item.contactMobile}）`

pos-uni/config.js

@@ -4,9 +4,10 @@ module.exports = {
 	// baseUrl: 'https://vue.ruoyi.vip/prod-api',
 	// baseUrl: 'http://192.168.0.196:8081/',
 	// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
+	baseUrl: 'https://www.youkerr.com/oilAdmin/',
 	// baseUrl: 'https://8q4f124343.yicp.fun/',
 	// baseUrl: 'http://192.168.31.96:8080/',
-	baseUrl: 'http://192.168.31.178:8081/',
+	// baseUrl: 'http://192.168.31.178:8081/',
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
 
 	// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',