bug

fuintAdmin_zt/src/main.js

@@ -50,7 +50,7 @@ Vue.prototype.handleTree = handleTree
 // Vue.prototype.pcUrl = 'http://192.168.0.121:82/'
 // Vue.prototype.pcUrl = 'http://192.168.31.96:82/'
 // Vue.prototype.pcUrl = 'http://47.95.206.185:85/'
-Vue.prototype.pcUrl = 'http://192.168.31.55:8081'
+Vue.prototype.pcUrl = 'https://www.youkerr.com/'
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)

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

@@ -93,5 +93,11 @@ public interface OilGunMapper extends BaseMapper<OilGun> {
      */
     int deleteById(Integer id);
 
+    /**
+     * 根据店铺id查询列表信息
+     * @param storeId
+     * @return
+     */
+    List<OilGunVO> selectListByStoreId(@Param("storeId") Integer storeId);
 }
 

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

@@ -122,7 +122,15 @@
             gun_name = #{oilGun.gunName}
             and store_id = #{oilGun.storeId}
     </select>
-<!--    &#45;&#45; and tank_id = #{oilGun.tankId}-->
+    <select id="selectListByStoreId" resultType="com.fuint.business.petrolStationManagement.vo.OilGunVO">
+        SELECT og.*,onu.oil_name FROM oil_gun og
+             LEFT JOIN oil_number onu on og.number_id = onu.number_id
+        where og.status = '启用'
+        <if test="storeId != null">
+            and og.store_id = #{storeId}
+        </if>
+    </select>
+    <!--    &#45;&#45; and tank_id = #{oilGun.tankId}-->
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilGunService.java

@@ -74,5 +74,5 @@ public interface OilGunService {
      * 根据油号id查询油枪列表信息
      * @return
      */
-    List<OilGun> selectOilGuns();
+    List<OilGunVO> selectOilGuns();
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilGunServiceImpl.java

@@ -191,11 +191,11 @@ public class OilGunServiceImpl implements OilGunService {
     }
 
     @Override
-    public List<OilGun> selectOilGuns() {
+    public List<OilGunVO> selectOilGuns() {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        QueryWrapper queryWrapper = new QueryWrapper();
+//        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+//        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
-        queryWrapper.eq("status","启用");
+//        queryWrapper.eq("status","启用");
-        return oilGunDao.selectList(queryWrapper);
+        return oilGunDao.selectListByStoreId(nowAccountInfo.getStoreId());
     }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java

@@ -47,7 +47,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/business/printer")
-@EnableWebMvc
+//@EnableWebMvc
 @Slf4j
 public class printerController extends BaseController {
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/HttpUtil.java

@@ -18,7 +18,7 @@ public class HttpUtil {
     public static String urlEncode(String source, String encode) {
         String result = source;
         try {
-            result = java.net.URLEncoder.encode(source, encode);
+            result = URLEncoder.encode(source, encode);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
             return "0";
@@ -29,7 +29,7 @@ public class HttpUtil {
     public static String urlEncodeGBK(String source) {
         String result = source;
         try {
-            result = java.net.URLEncoder.encode(source, "GBK");
+            result = URLEncoder.encode(source, "GBK");
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
             return "0";

fuintBackend/pom.xml

@@ -227,13 +227,13 @@
             <version>1.4.19</version>
         </dependency>
 
-        <!--    mvn install:install-file -DgroupId=yly_sdk -DartifactId=yly_sdk -Dversion=2.2 -Dpackaging=jar -Dfile=D:\code\oilSystem\fuintBackend\lib\yly_sdk_2.2.jar-->
+        <!--    mvn install:install-file -DgroupId=yly_sdk -DartifactId=yly_sdk -Dversion=2.2 -Dpackaging=jar -Dfile=D:\workspaces\oilSystem\fuintBackend\lib\yly_sdk_2.2.jar-->
 
-        <dependency>
+        <!--<dependency>
             <groupId>yly_sdk</groupId>
             <artifactId>yly_sdk</artifactId>
             <version>2.2</version>
-        </dependency>
+        </dependency>-->
 
     </dependencies>
 

pos-uni/pagesHome/Collection/Collection.vue

@@ -13,19 +13,19 @@
 				<!-- <input type="number" /> -->
 
 			</view>
-			<view class="title_">选择油号</view>
+			<!-- <view class="title_">选择油号</view>
 			<view class="warp-box">
 				<view class="w-box" :class="{ 'acv' : oilIndex == index }" @click="getoilIndex(index)"
 					v-for="(item,index) in oilList" :key="index">
 					{{item}}
 				</view>
 
-			</view>
+			</view> -->
 			<view class="title_">选择油枪</view>
 			<view class="warp-box">
 				<view class="w-box" :class="{ 'acv' : spearIndex == index }" @click="getspearIndex(index)"
 					v-for="(item,index) in spearList" :key="index">
-					{{item}}
+					{{item.gunName}}
 				</view>
 
 			</view>
@@ -69,6 +69,7 @@
 </template>
 
 <script>
+	import request from "../../utils/request";
 	import headers from '../../components/header/headers.vue'
 
 	export default {
@@ -157,6 +158,7 @@
 		onShow() {
 			// this.actList = ["1", "1", "1", "1", "1", ]
 			// this.status = "nomore" 底部刷新结束
+			this.getOilGun()
 		},
 		onPullDownRefresh() {
 			console.log("刷新");
@@ -172,6 +174,15 @@
 			headers
 		},
 		methods: {
+			// 获取油枪信息
+			getOilGun(){
+				request({
+					url: 'business/petrolStationManagement/oilGun/queryOilGunList',
+					method: 'get',
+				}).then((res) => {
+					this.spearList = res.data
+				})
+			},
 			// 跳会员
 			gosearchVip() {
 				uni.navigateTo({

pos-uni/unpackage/dist/dev/mp-weixin/pagesHome/Collection/Collection.js

@@ -160,10 +160,82 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _request = _interopRequireDefault(__webpack_require__(/*! ../../utils/request */ 174));
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var headers = function headers() {
   __webpack_require__.e(/*! require.ensure | components/header/headers */ "components/header/headers").then((function () {
     return resolve(__webpack_require__(/*! ../../components/header/headers.vue */ 291));
@@ -234,6 +306,7 @@ var _default = {
   onShow: function onShow() {
     // this.actList = ["1", "1", "1", "1", "1", ]
     // this.status = "nomore" 底部刷新结束
+    this.getOilGun();
   },
   onPullDownRefresh: function onPullDownRefresh() {
     console.log("刷新");
@@ -249,6 +322,16 @@ var _default = {
     headers: headers
   },
   methods: {
+    // 获取油枪信息
+    getOilGun: function getOilGun() {
+      var _this = this;
+      (0, _request.default)({
+        url: 'business/petrolStationManagement/oilGun/queryOilGunList',
+        method: 'get'
+      }).then(function (res) {
+        _this.spearList = res.data;
+      });
+    },
     // 跳会员
     gosearchVip: function gosearchVip() {
       uni.navigateTo({

pos-uni/unpackage/dist/dev/mp-weixin/pagesHome/Collection/Collection.wxml

@@ -1 +1 @@
-<view class="content data-v-0163a476"><view class="container data-v-0163a476"><headers vue-id="2b0fe83e-1" titles="{{titles}}" class="data-v-0163a476" bind:__l="__l" vue-slots="{{['default']}}"><u-icon vue-id="{{('2b0fe83e-2')+','+('2b0fe83e-1')}}" name="arrow-left" color="#fff" size="22" class="data-v-0163a476" bind:__l="__l"></u-icon></headers><view class="input-box data-v-0163a476"><view style="margin-right:10px;" class="data-v-0163a476">收款金额</view><view class="data-v-0163a476">{{AmountCollected}}</view></view><view class="input-box data-v-0163a476"><view style="margin-right:10px;" class="data-v-0163a476">优惠金额</view><view class="data-v-0163a476">{{DiscountAmount}}</view></view><view class="title_ data-v-0163a476">选择油号</view><view class="warp-box data-v-0163a476"><block wx:for="{{oilList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['getoilIndex',[index]]]]]}}" class="{{['w-box','data-v-0163a476',(oilIndex==index)?'acv':'']}}" bindtap="__e">{{''+item+''}}</view></block></view><view class="title_ data-v-0163a476">选择油枪</view><view class="warp-box data-v-0163a476"><block wx:for="{{spearList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['getspearIndex',[index]]]]]}}" class="{{['w-box','data-v-0163a476',(spearIndex==index)?'acv':'']}}" bindtap="__e">{{''+item+''}}</view></block></view><view style="width:100%;height:500px;" class="data-v-0163a476"></view><view class="bai-kuang data-v-0163a476"><view class="kuang-top data-v-0163a476"><view class="w-shi data-v-0163a476">添加备注</view><view style="color:#E8E8E8;" class="data-v-0163a476">|</view><view data-event-opts="{{[['tap',[['gosearchVip']]]]}}" class="w-shi data-v-0163a476" bindtap="__e">搜索会员</view></view><view class="num-box data-v-0163a476"><block wx:for="{{keyboardList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['KeyboardLogic',['$0'],[[['keyboardList','',index]]]]]]]}}" class="k-box data-v-0163a476" bindtap="__e"><block wx:if="{{item.type=='num'}}"><view class="CentralLogic data-v-0163a476">{{''+item.value+''}}</view></block><block wx:if="{{item.type=='img'}}"><view class="Centralimg data-v-0163a476"><view class="icon-box data-v-0163a476"><block wx:if="{{item.value=='smzf'}}"><image src="/static/imgs/smzf.png" class="data-v-0163a476"></image></block><block wx:if="{{item.value=='skzf'}}"><image src="/static/imgs/skzf.png" class="data-v-0163a476"></image></block><block wx:if="{{item.value=='hyzf'}}"><image src="/static/imgs/hyzf.png" class="data-v-0163a476"></image></block><block wx:if="{{item.value=='xjzf'}}"><image src="/static/imgs/xjzf.png" class="data-v-0163a476"></image></block><block wx:if="{{!item.value}}"><image style="height:30px;" src="/static/imgs/scjian.png" class="data-v-0163a476"></image></block></view><block wx:if="{{item.value=='smzf'}}"><view class="icon-size data-v-0163a476">扫码支付</view></block><block wx:if="{{item.value=='skzf'}}"><view class="icon-size data-v-0163a476">刷卡支付</view></block><block wx:if="{{item.value=='hyzf'}}"><view class="icon-size data-v-0163a476">会员支付</view></block><block wx:if="{{item.value=='xjzf'}}"><view class="icon-size data-v-0163a476">现金支付</view></block></view></block></view></block></view><view style="width:100%;height:25px;" class="data-v-0163a476"></view></view></view></view>
+<view class="content data-v-0163a476"><view class="container data-v-0163a476"><headers vue-id="2b0fe83e-1" titles="{{titles}}" class="data-v-0163a476" bind:__l="__l" vue-slots="{{['default']}}"><u-icon vue-id="{{('2b0fe83e-2')+','+('2b0fe83e-1')}}" name="arrow-left" color="#fff" size="22" class="data-v-0163a476" bind:__l="__l"></u-icon></headers><view class="input-box data-v-0163a476"><view style="margin-right:10px;" class="data-v-0163a476">收款金额</view><view class="data-v-0163a476">{{AmountCollected}}</view></view><view class="input-box data-v-0163a476"><view style="margin-right:10px;" class="data-v-0163a476">优惠金额</view><view class="data-v-0163a476">{{DiscountAmount}}</view></view><view class="title_ data-v-0163a476">选择油枪</view><view class="warp-box data-v-0163a476"><block wx:for="{{spearList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['getspearIndex',[index]]]]]}}" class="{{['w-box','data-v-0163a476',(spearIndex==index)?'acv':'']}}" bindtap="__e">{{''+item.gunName+''}}</view></block></view><view style="width:100%;height:500px;" class="data-v-0163a476"></view><view class="bai-kuang data-v-0163a476"><view class="kuang-top data-v-0163a476"><view class="w-shi data-v-0163a476">添加备注</view><view style="color:#E8E8E8;" class="data-v-0163a476">|</view><view data-event-opts="{{[['tap',[['gosearchVip']]]]}}" class="w-shi data-v-0163a476" bindtap="__e">搜索会员</view></view><view class="num-box data-v-0163a476"><block wx:for="{{keyboardList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['KeyboardLogic',['$0'],[[['keyboardList','',index]]]]]]]}}" class="k-box data-v-0163a476" bindtap="__e"><block wx:if="{{item.type=='num'}}"><view class="CentralLogic data-v-0163a476">{{''+item.value+''}}</view></block><block wx:if="{{item.type=='img'}}"><view class="Centralimg data-v-0163a476"><view class="icon-box data-v-0163a476"><block wx:if="{{item.value=='smzf'}}"><image src="/static/imgs/smzf.png" class="data-v-0163a476"></image></block><block wx:if="{{item.value=='skzf'}}"><image src="/static/imgs/skzf.png" class="data-v-0163a476"></image></block><block wx:if="{{item.value=='hyzf'}}"><image src="/static/imgs/hyzf.png" class="data-v-0163a476"></image></block><block wx:if="{{item.value=='xjzf'}}"><image src="/static/imgs/xjzf.png" class="data-v-0163a476"></image></block><block wx:if="{{!item.value}}"><image style="height:30px;" src="/static/imgs/scjian.png" class="data-v-0163a476"></image></block></view><block wx:if="{{item.value=='smzf'}}"><view class="icon-size data-v-0163a476">扫码支付</view></block><block wx:if="{{item.value=='skzf'}}"><view class="icon-size data-v-0163a476">刷卡支付</view></block><block wx:if="{{item.value=='hyzf'}}"><view class="icon-size data-v-0163a476">会员支付</view></block><block wx:if="{{item.value=='xjzf'}}"><view class="icon-size data-v-0163a476">现金支付</view></block></view></block></view></block></view><view style="width:100%;height:25px;" class="data-v-0163a476"></view></view></view></view>

pos-uni/unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -8,15 +8,15 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pagesHome/BusinessData/BusinessData",
+          "name": "",
-          "pathName": "pagesHome/BusinessData/BusinessData",
+          "pathName": "pagesHome/Collection/Collection",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pagesHome/MemberRecharge/list",
+          "name": "pagesHome/BusinessData/BusinessData",
-          "pathName": "pagesHome/MemberRecharge/list",
+          "pathName": "pagesHome/BusinessData/BusinessData",
           "query": "",
           "launchMode": "default",
           "scene": null