更新

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/car/carServiceImpl.java

@@ -386,7 +386,7 @@ public class carServiceImpl implements carService {
         updateDO.setAdminId(adminId);
         updateDO.setStartPlace(tranDO.getStartPlace());
         updateDO.setEndPlace(tranDO.getEndPlace());
-        updateDO.setStatus(CarStatusType.STATUS20.getCode());
+//        updateDO.setStatus(CarStatusType.STATUS20.getCode());
         tranDO.setTranCount(tranDO.getTranCount()+tranCount);
         if(tranDO.getTranCount() >= tranDO.getTotal()){
             tranDO.setStatus(CarStatusType.STATUS20.getCode());

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/trade/TradeServiceImpl.java

@@ -129,9 +129,9 @@ public class TradeServiceImpl implements TradeService {
                 List<TaskDO> taskDOList = taskMapper.selectList(new EntityWrapper<TaskDO>().eq("order_no", tradeDO.getOrderNo()).eq("task_type", "入库任务").eq("task_status", TaskStatusType.STATUS2.getCode()));
                 Float sum = 0.0f;
                 for(TaskDO item : taskDOList){
-                    sum += item.getNetWeight();
+                    sum = CalculationUtil.addToFloat(sum,item.getNetWeight());
                 }
-                tradeDTO.setCloseFlat(tradeDO.getCount() - sum- tradeDO.getFlatTotal());
+                tradeDTO.setCloseFlat(CalculationUtil.subToFloat(tradeDO.getCount(),CalculationUtil.subToFloat(sum,tradeDO.getFlatTotal())));
             } else {
                 SaleDO saleDO = saleMapper.selectById(tradeDO.getSalebuyId());
 //                tradeDTO.setUnloadingFee(0f);
@@ -147,9 +147,9 @@ public class TradeServiceImpl implements TradeService {
                 List<TaskDO> taskDOList = taskMapper.selectList(new EntityWrapper<TaskDO>().eq("order_no", tradeDO.getOrderNo()).eq("task_type", "出库任务").eq("task_status", TaskStatusType.STATUS2.getCode()));
                 Float sum = 0.0f;
                 for(TaskDO item : taskDOList){
-                    sum += item.getNetWeight();
+                    sum = CalculationUtil.addToFloat(sum,item.getNetWeight());
                 }
-                tradeDTO.setCloseFlat(tradeDO.getCount() - sum- tradeDO.getFlatTotal());
+                tradeDTO.setCloseFlat(CalculationUtil.subToFloat(tradeDO.getCount(),CalculationUtil.subToFloat(sum,tradeDO.getFlatTotal())));
             }
             CompanyDO companyDO = companyMapper.selectById(tradeDO.getTradeCompanyId());
             if (companyDO != null) {

unimall-app-api/src/main/java/com/iotechn/unimall/app/api/integral/IntegralServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.iotechn.unimall.app.api.advertisement.AdvertisementService;
 import com.iotechn.unimall.biz.service.sale.SaleBizService;
 import com.iotechn.unimall.core.exception.ServiceException;
+import com.iotechn.unimall.core.util.HttpUtils;
 import com.iotechn.unimall.data.domain.*;
 import com.iotechn.unimall.data.dto.*;
 import com.iotechn.unimall.data.enums.AdvertisementType;
@@ -12,6 +13,8 @@ import com.iotechn.unimall.data.enums.RecommendType;
 import com.iotechn.unimall.data.enums.TaskStatusType;
 import com.iotechn.unimall.data.mapper.*;
 import com.iotechn.unimall.data.model.Page;
+import org.apache.http.HttpResponse;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -80,6 +83,24 @@ public class IntegralServiceImpl implements IntegralService {
             portPriceDTOS.add(portPriceDTO);
         }
         integralIndexDataDTO.setPortInfo(portPriceDTOS);
+        /**
+         * 期货价格
+         */
+        List<InfoDTO> infoDTOS = new ArrayList<>();
+        String host = "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207";
+        String path = "";
+        String method = "GET";
+        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> querys = new HashMap<String, String>();
+        try {
+            HttpResponse response = HttpUtils.doGet(host, path, method, headers, querys);
+            System.out.println("期货价格");
+//            System.out.println(response.toString());
+            //获取response的body
+            System.out.println(EntityUtils.toString(response.getEntity()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
 //        List<AdvertisementDO> activeAd1 = advertisementService.getActiveAd(0);
 //        if(activeAd1.size() > 0){

unimall-app/manifest.json

@@ -73,12 +73,18 @@
                 }
             },
             "android" : {
-                "permissions" : [],
+                "autoSdkPermissions" : false,
+                "permissionPhoneState" : {
+                    "request" : "always",
+                    "prompt" : "为保证您正常、安全地使用，需要获取设备识别码(部分手机提示为获取手机号码)使用权限，请允许。"
+                },
                 "permissionExternalStorage" : {
-                    "request" : "none",
-                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                    "request" : "always",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限，请允许。"
                 },
-                "autoSdkPermissions" : false
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>"
+                ]
             },
             "icons" : {
                 "android" : {
@@ -131,6 +137,9 @@
             }
         },
         "nvueCompiler" : "weex",
-        "modules" : {}
+        "modules" : {
+            "Push" : {},
+            "SQLite" : {}
+        }
     }
 }

unimall-app/pageA/pages/account.vue

@@ -299,8 +299,8 @@
 					}).then(res => {			
 						if(res.data.code=='SUCCESS'){
 							that.$api.msg('添加成功')
-							uni.hideLoading()
 						    setTimeout(()=>{uni.navigateBack({})},1000);
+							uni.hideLoading()
 						}else{
 							that.$api.msg(res.data.code)
 						}

unimall-app/pageA/pages/task.vue

@@ -282,9 +282,9 @@
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
 				}).then(res => {			
-					uni.hideLoading()
 					that.$api.msg('完成成功')
 					setTimeout(()=>{uni.navigateBack({})},1000);
+					uni.hideLoading()
 				})
 			},
 			ChooseImageTitleNo() {
@@ -443,9 +443,9 @@
 								that.$api.msg(failres.errmsg)
 								uni.hideLoading()
 							}).then(res => {			
-								uni.hideLoading()
 								that.$api.msg('完成成功')
 								setTimeout(()=>{uni.navigateBack({})},1000);
+								uni.hideLoading()
 							})
 						  }
 					  }

unimall-app/pageA/pages/task_detail_jy.vue

@@ -171,9 +171,9 @@
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
 				}).then(res => {			
-					uni.hideLoading()
 					that.$api.msg('完成成功')
 					setTimeout(()=>{uni.navigateBack({})},1000);
+					uni.hideLoading()
 				})
 			},
 			priceInput(e){

unimall-app/pageA/product/detail_upload.vue

@@ -194,10 +194,10 @@
 				}, failres => {
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
-				}).then(res => {			
-					uni.hideLoading()
+				}).then(res => {		
 					that.$api.msg('上传成功')
-					setTimeout(()=>{uni.navigateBack({})},1000);
+					setTimeout(()=>{uni.navigateBack({})},1000);	
+					uni.hideLoading()
 				})
 			},
 		

unimall-app/pages/user/task_arrive.vue

@@ -458,9 +458,9 @@
 						that.$api.msg(failres.errmsg)
 						uni.hideLoading()
 					  }).then(res => {
-						  uni.hideLoading()
 							that.$api.msg('完成成功')
 							setTimeout(()=>{uni.navigateBack({})},1000);
+						  uni.hideLoading()
 					  
 					 
 				})
@@ -557,10 +557,10 @@
 				}, failres => {
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
-				}).then(res => {			
-					uni.hideLoading()
+				}).then(res => {		
 					that.$api.msg('完成成功')
-					setTimeout(()=>{uni.navigateBack({})},1000);
+					setTimeout(()=>{uni.navigateBack({})},1000);	
+					uni.hideLoading()
 				})
 			},
 

unimall-app/pages/user/task_detail_hy.vue

@@ -559,9 +559,9 @@
 						  	that.$api.msg(failres.errmsg)
 						  	uni.hideLoading()
 						  }).then(res => {
-							  uni.hideLoading()
 								that.$api.msg('完成成功')
 								setTimeout(()=>{uni.navigateBack({})},1000);
+							  uni.hideLoading()
 						  })
 						}
 					  }
@@ -657,10 +657,10 @@
 				}, failres => {
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
-				}).then(res => {			
-					uni.hideLoading()
+				}).then(res => {		
 					that.$api.msg('完成成功')
-					setTimeout(()=>{uni.navigateBack({})},1000);
+					setTimeout(()=>{uni.navigateBack({})},1000);	
+					uni.hideLoading()
 				})
 			},
 

unimall-app/pages/user/task_detail_jh.vue

@@ -233,10 +233,10 @@
 				}, failres => {
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
-				}).then(res => {			
-					uni.hideLoading()
+				}).then(res => {		
 					that.$api.msg('保存成功')
-					setTimeout(()=>{uni.navigateBack({})},1000);
+					setTimeout(()=>{uni.navigateBack({})},1000);	
+					uni.hideLoading()
 				})
 				
 			},
@@ -264,9 +264,9 @@
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
 				}).then(res => {			
-					uni.hideLoading()
 					that.$api.msg('完成成功')
 					setTimeout(()=>{uni.navigateBack({})},1000);
+					uni.hideLoading()
 				})
 				
 			},

unimall-app/pages/user/task_detail_kn.vue

@@ -309,10 +309,10 @@
 							}, failres => {
 								that.$api.msg(failres.errmsg)
 								uni.hideLoading()
-							}).then(res => {			
-								uni.hideLoading()
+							}).then(res => {		
 								that.$api.msg('完成成功')
-								setTimeout(()=>{uni.navigateBack({})},1000);
+								setTimeout(()=>{uni.navigateBack({})},1000);	
+								uni.hideLoading()
 							})
 						  }
 					  }
@@ -384,10 +384,10 @@
 				}, failres => {
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
-				}).then(res => {			
-					uni.hideLoading()
+				}).then(res => {		
 					that.$api.msg('完成成功')
-					setTimeout(()=>{uni.navigateBack({})},1000);
+					setTimeout(()=>{uni.navigateBack({})},1000);	
+					uni.hideLoading()
 				})
 			},
 		},

unimall-app/pages/user/task_detail_pc.vue

@@ -263,9 +263,9 @@
 								that.$api.msg(failres.errmsg)
 								uni.hideLoading()
 							}).then(res => {			
-								uni.hideLoading()
 								that.$api.msg('完成成功')
 								setTimeout(()=>{uni.navigateBack({})},1000);
+								uni.hideLoading()
 							})
 						  }
 					  }

unimall-app/pages/user/task_detail_zx.vue

@@ -474,9 +474,9 @@
 								that.$api.msg(failres.errmsg)
 								uni.hideLoading()
 							}).then(res => {			
-								uni.hideLoading()
 								that.$api.msg('完成成功')
 								setTimeout(()=>{uni.navigateBack({})},1000);
+								uni.hideLoading()
 							})
 						  }
 					  }
@@ -552,10 +552,10 @@
 				}, failres => {
 					that.$api.msg(failres.errmsg)
 					uni.hideLoading()
-				}).then(res => {			
-					uni.hideLoading()
+				}).then(res => {		
 					that.$api.msg('完成成功')
-					setTimeout(()=>{uni.navigateBack({})},1000);
+					setTimeout(()=>{uni.navigateBack({})},1000);	
+					uni.hideLoading()
 				})
 			},
 		},

unimall-data/src/main/java/com/iotechn/unimall/data/dto/InfoDTO.java

@@ -0,0 +1,15 @@
+package com.iotechn.unimall.data.dto;
+
+import lombok.Data;
+
+/**
+ * @Author:chengchangjiang
+ * @Description:
+ * @Date:Created in 17:05 2021-07-27
+ */
+@Data
+public class InfoDTO {
+    private String goodsName;
+    private String newPrice;
+    private String date;
+}

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/ReportMapper.xml

@@ -138,7 +138,8 @@
         ut.packing_money as packingMoney,
         ut.invoice_money as invoiceMoney,
         ut.unit_price + ut.basis + ut.invoice_money+ ut.packing_money AS unitPrice1,
-        (ut.unit_price + ut.basis + ut.invoice_money+ ut.packing_money) * uta.net_weight AS money,
+        cast(cast((ut.unit_price + ut.basis + ut.invoice_money+ ut.packing_money)as decimal(8,2))
+         * cast(uta.net_weight as decimal(8,2)) as decimal(8,2)) as money,
         '已收款' AS collectStatus,
         uta.gmt_create AS collectDate,
         0 AS replen,
@@ -183,9 +184,10 @@
         ut.invoice_money as invoiceMoney,
         ub.basis as basis,
         ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money as unitPrice1,
-        (ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money)
-         * uta.net_weight as money,
-        (ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money) * uta.net_weight as notMoney,
+        cast(cast((ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money)as decimal(8,2))
+         * cast(uta.net_weight as decimal(8,2)) as decimal(8,2)) as money,
+        cast(cast((ut.unit_price + ub.basis - ifnull(uta.deduction,0) + ut.unloading_fee + ut.invoice_money)as decimal(8,2))
+         * cast(uta.net_weight as decimal(8,2)) as decimal(8,2)) as notMoney,
         '未付款' as payStatus,
         null as payDate,
         0 as replen,

unimall-launcher/src/main/resources/application.properties

@@ -10,7 +10,7 @@ com.iotechn.unimall.env=3
 ########################################################
 spring.druid.driverClassName=com.mysql.jdbc.Driver
 ##\u6B63\u5F0F\u5E93
-spring.druid.url=jdbc:mysql://47.100.3.209:3306/test?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+spring.druid.url=jdbc:mysql://47.100.3.209:3306/unimall?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
 ##\u6D4B\u8BD5\u5E93
 #spring.druid.url=jdbc:mysql://47.100.3.209:3306/test?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
 ##\u6570\u636E\u540C\u6B65\u5E93