bug

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

@@ -56,6 +56,9 @@ export default {
     // }
   },
   watch: {
+    visitedViews(newdata) {
+      console.log("newdata",newdata)
+    },
     $route() {
       this.addTags()
       this.moveToCurrentTag()
@@ -88,6 +91,8 @@ export default {
     },
     isFirstView() {
       try {
+        console.log("isFirstView",this.selectedTag.fullPath)
+        console.log("isFirstView2",this.visitedViews[1].fullPath)
         return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index'
       } catch (err) {
         return false

fuintAdmin/src/router/index.js

@@ -150,11 +150,13 @@ export const constantRoutes = [
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
+    breadcrumb: false,
     children: [
       {
         path: '/purchase/details/:PpurchaseId/:PorderDate/:PapprovalStatus/:PorderNumber',
         component: () => import('@/views/convenienceStore/purchase/details'),
         name: 'purchase-details',
+
         props: true, // 启用路由参数作为组件的props
         meta: { title: '进货详情', icon: 'user' }
       },
@@ -166,10 +168,12 @@ export const constantRoutes = [
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
+    breadcrumb: false,
     children: [
       {
         path: '/returns/details/:PreturnsId/:PorderDate/:PapprovalStatus/:PorderNumber',
         component: () => import('@/views/convenienceStore/returns/details'),
+
         name: 'returns-details',
         props: true, // 启用路由参数作为组件的props
         meta: { title: '退货详情', icon: 'user' }
@@ -204,7 +208,7 @@ export const constantRoutes = [
         component: () => import('@/views/convenienceStore/inventory/details'),
         name: 'inventory-details',
         props: true, // 启用路由参数作为组件的props
-        meta: { title: '退货详情', icon: 'user' }
+        meta: { title: '盘点详情', icon: 'user' }
       },
     ]
   },

fuintAdmin/src/views/convenienceStore/inventory/details.vue

@@ -498,9 +498,8 @@ export default {
           }
         })
         if(flag) {
-
           let getPurchaseByTankIdData
-          await getSalesByMtInventoryApi().then(res=>{
+          await getSalesByMtInventoryApi({goodsId:mul.id}).then(res=>{
             getPurchaseByTankIdData = res.data
           })
 

fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java

@@ -49,8 +49,8 @@ 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 = "https://8q4f124343.yicp.fun/api/fyPay/notify";
+//    public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
 
     //下单
     public static String fuiou_21_url = "https://fundwx.fuiou.com/preCreate";

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

@@ -182,14 +182,18 @@
             purchase_id = #{mtPurchaseDetails.purchaseId}
 
     </select>
-    <select id="getIncomingGoodsData" resultMap="MtPurchaseDetailsMap">
+    <select id="getIncomingGoodsData" resultType="com.fuint.business.convenienceSore.vo.MtPurchaseDetailsVO"
+            parameterType="java.lang.Integer">
         select opo.*,
-        op.update_time updateTime
+               op.update_time updateTime
         from mt_purchase_details opo
-        left join mt_purchase op ON opo.purchase_id = op.id
+                 left join mt_purchase op ON opo.purchase_id = op.id
-        where op.status = 'qrts' and opo.goods_id = #{goodsId}
+        where op.approval_status = 'qrts' and opo.goods_id = #{goodsId}
         order by op.update_time DESC limit 1
     </select>
+<!--        <select id="getIncomingGoodsData" resultMap="MtPurchaseDetailsMap">-->
+
+<!--    </select>-->
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseDetailsServiceImpl.java

@@ -172,7 +172,7 @@ public class MtPurchaseDetailsServiceImpl implements MtPurchaseDetailsService {
      */
     @Override
     public MtPurchaseDetails getIncomingGoodsData(Integer goodsId) {
-        mtPurchaseDetailsDao.getIncomingGoodsData(goodsId);
+        MtPurchaseDetailsVO incomingGoodsData = mtPurchaseDetailsDao.getIncomingGoodsData(goodsId);
-        return null;
+        return incomingGoodsData;
     }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseServiceImpl.java

@@ -27,6 +27,8 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 
+import static java.math.RoundingMode.HALF_DOWN;
+
 /**
  * 商品进货表(MtPurchase)表服务实现类
  *
@@ -217,7 +219,7 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
                     // 计算总库存
                     BigDecimal sumStock = stockBig.add(new BigDecimal(mtPurchaseDetailsVO.getQuantityPurchased().toString()));
 
-                    unitPrice = Double.parseDouble( sumBig.divide(sumStock).toString());
+                    unitPrice = Double.parseDouble( sumBig.divide(sumStock,2,HALF_DOWN).toString());
                 }
                 //获取原总价
                 mtPurchaseDetailsVO.setUnitPrice(unitPrice);

fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java

@@ -104,6 +104,11 @@ public class LJStoreController extends BaseController {
         return getSuccessResult(storeService.queryStoreByPosition(map));
     }
 
+    @GetMapping("/isRecharge")
+    public ResponseObject isRecharge(){
+        return getSuccessResult(false);
+    }
+
 //    /**
 //     * 修改等级规则信息
 //     * @param map

gasStation-uni/pages/index/index.vue

@@ -53,7 +53,6 @@
 						</view>
 						<view class="jg-size">积分商城</view>
 					</view>
-					<view @click="isRecharge">.</view>
 
 				</view>
 				<!-- 金刚区结束 -->
@@ -275,6 +274,7 @@
 		},
 		onShow() {
 			this.isJoined()
+			this.isRecharge()
 			// this.getIndexBanner()
 		},
 		components: {
@@ -282,11 +282,16 @@
 		},
 		methods: {
 			isRecharge(){
-				if (this.isOpen){
+				request({
-					this.isOpen = false;
+					url: 'business/storeInformation/store/isRecharge',
-				}else{
+					method: 'get',
-					this.isOpen = true
+				}).then(res => {
-				}
+					if (res.data){
+						this.isOpen = true
+					}else{
+						this.isOpen = false
+					}
+				})
 			},
 			// 返回图片路径
 			getBannerUrl(url) {