Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","freight_receiving_dispatching_car");
+        generateByTables("Gongdc", "com.yh.saas.plugin.yiliangyiyun","app_version");
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/AppVersionController.java

@@ -0,0 +1,36 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
+import com.yh.saas.plugin.yiliangyiyun.service.IAppVersionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * APP版本管理 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-23
+ */
+@RestController
+@RequestMapping("/appVersion")
+public class AppVersionController {
+    @Autowired
+    private IAppVersionService appVersionService;
+    /**
+     * 查看合同信息
+     */
+    @GetMapping("/selectInfo")
+    public AppVersion selectInfo(@RequestParam String appid, String version, String imei) {
+        return appVersionService.selectInfo(appid,version,imei);
+    }
+
+
+}
+

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/AppVersion.java

@@ -0,0 +1,64 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * APP版本管理
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("app_version")
+public class AppVersion extends BaseModel<AppVersion> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 版本号
+     */
+    private String version;
+    /**
+     * 提示信息
+     */
+    private String note;
+    /**
+     * 路径
+     */
+    private String url;
+    /**
+     * wgt路径
+     */
+    private String wgtUrl;
+    /**
+     * 版本code码
+     */
+    private String versionCode;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/AppVersionMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * APP版本管理 Mapper 接口
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-23
+ */
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IAppVersionService.java

@@ -0,0 +1,22 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * APP版本管理 服务类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-23
+ */
+public interface IAppVersionService extends IService<AppVersion> {
+    /**
+     * 查看
+     *
+     * @param appid
+     */
+    AppVersion selectInfo(String appid, String version, String imei);
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/AppVersionServiceImpl.java

@@ -0,0 +1,30 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
+import com.yh.saas.plugin.yiliangyiyun.mapper.AppVersionMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IAppVersionService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * APP版本管理 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-08-23
+ */
+@Service
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements IAppVersionService {
+
+    /**
+     * 查看
+     *
+     * @param appid
+     */
+    @Override
+    public AppVersion selectInfo(String appid, String version, String imei) {
+        AppVersion appVersion=this.selectById("1");
+        return appVersion;
+    }
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FreightReceivingDispatchingServiceImpl.java

@@ -146,7 +146,7 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
                 .eq("delete_flag","0"));
         if(!CollectionUtils.isEmpty(freightReceivingDispatchingList)){
             for (FreightReceivingDispatching freightReceivingDispatching:freightReceivingDispatchingList){
-                freightReceivingDispatching.setSignedFor(String.valueOf(Float.valueOf(freightReceivingDispatching.getSignedFor()) + 1));
+                freightReceivingDispatching.setSignedFor(String.valueOf(Integer.valueOf(freightReceivingDispatching.getSignedFor()) + 1));
                 this.updateById(freightReceivingDispatching);
             }
             freightReceivingDispatchingCar.setGoodsIngPayable(freightReceivingDispatchingCar.getReciveNetWeight()*freightReceivingDispatchingList.get(0).getGoodsPrice());
@@ -228,26 +228,27 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
      */
     @Override
     public String confirmFreightReceivingDispatchingCar(FreightReceivingDispatchingCar freightReceivingDispatchingCar) {
-        freightReceivingDispatchingCar.setId(IdGenerator.generateUUID());
-        freightReceivingDispatchingCar.setStatusFlag("3");
-        freightReceivingDispatchingCar.setStatus("待结算");
-        freightReceivingDispatchingCarService.insert(freightReceivingDispatchingCar);
+        FreightReceivingDispatchingCar freightReceivingDispatchingCar1=freightReceivingDispatchingCarService.selectById(freightReceivingDispatchingCar.getId());
+        freightReceivingDispatchingCar1.setStatusFlag("3");
+        freightReceivingDispatchingCar1.setStatus("待结算");
+
         List<FreightReceivingDispatching> freightReceivingDispatchingList=this.selectList(new EntityWrapper<FreightReceivingDispatching>()
                 .eq("batch",freightReceivingDispatchingCar.getBatch())
                 .eq("delete_flag","0"));
         if(!CollectionUtils.isEmpty(freightReceivingDispatchingList)){
             for (FreightReceivingDispatching freightReceivingDispatching:freightReceivingDispatchingList){
                 freightReceivingDispatching.setToSettled(String.valueOf(Integer.valueOf(freightReceivingDispatching.getToSettled()) + 1));
+                freightReceivingDispatching.setSignedFor(String.valueOf(Integer.valueOf(freightReceivingDispatching.getSignedFor()) - 1));
                 this.updateById(freightReceivingDispatching);
             }
             //发货净重小
-            if (freightReceivingDispatchingCar.getReciveNetWeight()< freightReceivingDispatchingCar.getDispatchNetWeight()){
-                freightReceivingDispatchingCar.setGoodsIngPayable(freightReceivingDispatchingCar.getReciveNetWeight()*freightReceivingDispatchingList.get(0).getGoodsPrice());
-                freightReceivingDispatchingCar.setFreightIngPayable(freightReceivingDispatchingCar.getReciveNetWeight()*freightReceivingDispatchingList.get(0).getFreightUnitPrice()-freightReceivingDispatchingCar.getFreightDeductionAmount());
+            if (freightReceivingDispatchingCar1.getReciveNetWeight()< freightReceivingDispatchingCar.getDispatchNetWeight()){
+                freightReceivingDispatchingCar1.setGoodsIngPayable(freightReceivingDispatchingCar1.getReciveNetWeight()*freightReceivingDispatchingList.get(0).getGoodsPrice());
+                freightReceivingDispatchingCar1.setFreightIngPayable(freightReceivingDispatchingCar1.getReciveNetWeight()*freightReceivingDispatchingList.get(0).getFreightUnitPrice()-freightReceivingDispatchingCar.getFreightDeductionAmount());
             }
             else{
-                freightReceivingDispatchingCar.setGoodsIngPayable(freightReceivingDispatchingCar.getDispatchNetWeight()*freightReceivingDispatchingList.get(0).getGoodsPrice());
-                freightReceivingDispatchingCar.setFreightIngPayable(freightReceivingDispatchingCar.getDispatchNetWeight()*freightReceivingDispatchingList.get(0).getFreightUnitPrice()-freightReceivingDispatchingCar.getFreightDeductionAmount());
+                freightReceivingDispatchingCar1.setGoodsIngPayable(freightReceivingDispatchingCar.getDispatchNetWeight()*freightReceivingDispatchingList.get(0).getGoodsPrice());
+                freightReceivingDispatchingCar1.setFreightIngPayable(freightReceivingDispatchingCar.getDispatchNetWeight()*freightReceivingDispatchingList.get(0).getFreightUnitPrice()-freightReceivingDispatchingCar.getFreightDeductionAmount());
 
             }
         }
@@ -258,8 +259,8 @@ public class FreightReceivingDispatchingServiceImpl extends ServiceImpl<FreightR
 //            freightReceivingDispatching.setStatus("收货");
 //            this.updateById(freightReceivingDispatching);
 //        }
-
-        return freightReceivingDispatchingCar.getId();
+        freightReceivingDispatchingCarService.updateById(freightReceivingDispatchingCar1);
+        return freightReceivingDispatchingCar1.getId();
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/AppVersionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.AppVersionMapper">
+
+</mapper>