Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

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

@@ -406,8 +406,8 @@ public class CommonUserController {
             Map<String, String> map = new HashMap<String, String>(4);
             map.put("user", "e8a253b1-12ee-46a4-aebe-58b55df34301");
             map.put("pwd", "o1v78Rwje3U297j0owa7F2591174d5");
-            map.put("srt", "dfd28720-6c40-4029-8f3f-88e7e0ceec74");
-            map.put("cid", "26f33235-dff0-43d6-871b-9d1682996c12");
+            map.put("srt", "762ea319-5f05-4810-aa28-5f92c99485ae");
+            map.put("cid", "871a05fd-a098-49af-9760-27ce9ecf61e3");
             String url = "https://openapi-test.sinoiov.cn/save/apis/login";
             // 设置 http 读写超时
             DataExchangeService des = new DataExchangeService(5000, 8000);
@@ -447,8 +447,8 @@ public class CommonUserController {
         }
         Map<String, String> map = new HashMap<String, String>(4);
         map.put("token", token.getToken());
-        map.put("cid", "26f33235-dff0-43d6-871b-9d1682996c12");
-        map.put("srt", "dfd28720-6c40-4029-8f3f-88e7e0ceec74");
+        map.put("cid", "871a05fd-a098-49af-9760-27ce9ecf61e3");
+        map.put("srt", "762ea319-5f05-4810-aa28-5f92c99485ae");
         map.put("vclN", "陕YH0009");
         map.put("vco", "2");
         map.put("qryBtm", "2021-09-05 15:56:46");

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

@@ -81,5 +81,15 @@ public class HyCargoOwnerCapitalInfoController {
         return hyCargoOwnerCapitalInfoService.examineList(hyCargoOwnerCapitalInfo);
     }
 
+    /**
+     * 后台管理货主银行流水列表
+     *
+     * @param hyCargoOwnerCapitalInfo
+     * @return
+     */
+    @GetMapping("/selectBankFlow")
+    public Page<HyCargoOwnerCapitalInfo> selectBankFlow(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo) {
+        return hyCargoOwnerCapitalInfoService.selectBankFlow(hyCargoOwnerCapitalInfo);
+    }
 }
 

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

@@ -46,7 +46,7 @@ public class HyCargoOwnerCapitalInfo extends BaseModel<HyCargoOwnerCapitalInfo>
      */
     private String companyId;
     /**
-     * 类型
+     * 类型（充值、提现、支付预付款、支付尾款）
      */
     private String types;
     /**
@@ -82,7 +82,7 @@ public class HyCargoOwnerCapitalInfo extends BaseModel<HyCargoOwnerCapitalInfo>
      */
     private String serialNumber;
     /**
-     * 提现到账时间
+     * 提现(充值)到账时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -146,6 +146,11 @@ public class HyCargoOwnerCapitalInfo extends BaseModel<HyCargoOwnerCapitalInfo>
      */
     @TableField(exist = false)
     private String accountNumber;
+    /**
+     * 所属企业
+     */
+    @TableField(exist = false)
+    private String affiliatedEnterprise;
 
     @Override
     protected Serializable pkVal() {

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

@@ -38,6 +38,10 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
      * 订单id
      */
     private String orderId;
+    /**
+     * 用户id
+     */
+    private String commonId;
     /**
      * 运费表id
      */
@@ -57,7 +61,7 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
     /**
      * 服务费
      */
-    private Double  serviceCharge;
+    private Double serviceCharge;
     /**
      * 合计应还
      */
@@ -70,6 +74,15 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
      * 未还
      */
     private Double notRepaid;
+    /**
+     * 状态key（1未还款3部分还款5已还款）
+     */
+    private String statusKey;
+    /**
+     * 状态
+     */
+    private String status;
+
 
 
 

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

@@ -49,4 +49,20 @@ public interface HyCargoOwnerCapitalInfoMapper extends BaseMapper<HyCargoOwnerCa
      * @return
      */
     List<HyCargoOwnerCapitalInfo> getWithdrawalListByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询货主提现总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getBankFlowCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询货主提现列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<HyCargoOwnerCapitalInfo> getBankFlowListByCondition(Map<String, Object> pageView);
 }

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

@@ -51,4 +51,11 @@ public interface IHyCargoOwnerCapitalInfoService extends IService<HyCargoOwnerCa
      * @return
      */
     String examineList(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo);
+
+    /**
+     * 后台管理货主银行流水列表
+     * @param hyCargoOwnerCapitalInfo
+     * @return
+     */
+    Page<HyCargoOwnerCapitalInfo> selectBankFlow(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo);
 }

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

@@ -163,15 +163,15 @@ public class FreightInfoServiceImpl extends ServiceImpl<FreightInfoMapper, Freig
     /**
      * 每秒执行一次
      */
-    @Transactional
-    @Scheduled(cron = "* * * * * ?")
-    public void rushTime() {
-        //获取当前日期的前一天
-        Calendar calendar1 = Calendar.getInstance();
-        calendar1.add(Calendar.DATE, -1);
-        Date date = calendar1.getTime();
-
-        //查询费用信息
-        List<FreightInfo> freightInfoList = this.selectList(new EntityWrapper<FreightInfo>().eq("delete_flag","0"));
-    }
+//    @Transactional
+//    @Scheduled(cron = "* * * * * ?")
+//    public void rushTime() {
+//        //获取当前日期的前一天
+//        Calendar calendar1 = Calendar.getInstance();
+//        calendar1.add(Calendar.DATE, -1);
+//        Date date = calendar1.getTime();
+//
+//        //查询费用信息
+//        List<FreightInfo> freightInfoList = this.selectList(new EntityWrapper<FreightInfo>().eq("delete_flag","0"));
+//    }
 }

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

@@ -176,4 +176,32 @@ public class HyCargoOwnerCapitalInfoServiceImpl extends ServiceImpl<HyCargoOwner
         }
         return "ng";
     }
+
+
+    /**
+     * 后台管理货主银行流水列表
+     * @param hyCargoOwnerCapitalInfo
+     * @return
+     */
+    @Override
+    public Page<HyCargoOwnerCapitalInfo> selectBankFlow(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo){
+        Map<String, Object> pageView = new HashMap<>(8);
+        pageView.put("startRecord", (hyCargoOwnerCapitalInfo.getCurrentPage() - 1)
+                * hyCargoOwnerCapitalInfo.getPageSize());
+        //用户id
+        pageView.put("searchKeyWord", hyCargoOwnerCapitalInfo.getSearchKeyWord());
+        pageView.put("startDate", hyCargoOwnerCapitalInfo.getStartDate());
+        pageView.put("endDate", hyCargoOwnerCapitalInfo.getEndDate());
+        pageView.put("pageSize", hyCargoOwnerCapitalInfo.getPageSize());
+        pageView.put("currentPage", hyCargoOwnerCapitalInfo.getCurrentPage());
+        // 查询账单总数
+        Integer dataCount = baseMapper.getBankFlowCountByCondition(pageView);
+        List<HyCargoOwnerCapitalInfo> dataList = baseMapper.getBankFlowListByCondition(pageView);
+        Page<HyCargoOwnerCapitalInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(hyCargoOwnerCapitalInfo.getCurrentPage());
+        page.setSize(hyCargoOwnerCapitalInfo.getPageSize());
+        return page;
+    }
 }

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

@@ -144,6 +144,7 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                         RepaymentInfo repaymentInfo = new RepaymentInfo();
                         repaymentInfo.setId(IdGenerator.generateUUID());
                         repaymentInfo.setOrderId(orderInfo1.getId());
+                        repaymentInfo.setCommonId(orderInfo1.getCargoCommonId());
                         repaymentInfo.setFreightId(freightInfo.getId());
                         repaymentInfo.setFreight(freightInfo.getActualFreight());
                         repaymentInfo.setOverdueFee(0d);

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

@@ -81,14 +81,14 @@ public class HyOrderTravelPathServiceImpl extends ServiceImpl<HyOrderTravelPathM
     }
 
 
-    public void login() {
+    public HyToken login() {
         try {
             Map<String, String> map = new HashMap<String, String>(4);
             map.put("user", "ec841c89-4550-4dae-a377-0bda27185932");
             map.put("pwd", "z6ZJcF32T28EF9Tkn8923uDT42609w");
             map.put("srt", "762ea319-5f05-4810-aa28-5f92c99485ae");
             map.put("cid", "871a05fd-a098-49af-9760-27ce9ecf61e3");
-            String url = "https://openapi-test.sinoiov.cn/save/apis/login";
+            String url = "https://zhiyunopenapi.95155.com/save/apis/login";
             // 设置 http 读写超时
             DataExchangeService des = new DataExchangeService(5000, 8000);
             System.out.println("请求地址:" + url);
@@ -111,9 +111,11 @@ public class HyOrderTravelPathServiceImpl extends ServiceImpl<HyOrderTravelPathM
             token.setToken(map1.get("\"result\"").replaceAll("\"", ""));
             hyToken.insert(token);
             System.out.println("返回:" + res);
+            return token;
         } catch (Exception e) {
             System.out.println("e:" + e.getMessage());
         }
+        return null;
     }
 
     @Override
@@ -142,14 +144,12 @@ public class HyOrderTravelPathServiceImpl extends ServiceImpl<HyOrderTravelPathM
         HyToken token = hyToken.selectOne(new EntityWrapper<HyToken>()
                 .eq("delete_flag", 0));
         if (token == null) {
-            login();
-            token = hyToken.selectOne(new EntityWrapper<HyToken>()
-                    .eq("delete_flag", "0"));
+            token = login();
         }
         Map<String, String> map = new HashMap<String, String>(4);
         map.put("token", token.getToken());
-        map.put("cid", "26f33235-dff0-43d6-871b-9d1682996c12");
-        map.put("srt", "dfd28720-6c40-4029-8f3f-88e7e0ceec74");
+        map.put("cid", "871a05fd-a098-49af-9760-27ce9ecf61e3");
+        map.put("srt", "762ea319-5f05-4810-aa28-5f92c99485ae");
         map.put("vclN", hyCarrierInfo.getCarNo());
         //车牌颜色
         if ("黄色".equals(hyDriverCarInfo.getCarNumberColour())) {
@@ -171,7 +171,7 @@ public class HyOrderTravelPathServiceImpl extends ServiceImpl<HyOrderTravelPathM
             String endDate = f.format(hyCarrierInfo.getUnloadingDate());
             map.put("qryEtm", endDate);
 
-            String url = "https://openapi-test.sinoiov.cn/save/apis/routerPath";
+            String url = "https://zhiyunopenapi.95155.com/save/apis/routerPath";
             // 设置 http 读写超时
             DataExchangeService des = new DataExchangeService(5000, 8000);
             System.out.println("请求地址:" + url);
@@ -215,7 +215,7 @@ public class HyOrderTravelPathServiceImpl extends ServiceImpl<HyOrderTravelPathM
             String date = f.format(new Date(System.currentTimeMillis()));
             map.put("qryEtm", date);
 
-            String url = "https://openapi-test.sinoiov.cn/save/apis/routerPath";
+            String url = "https://zhiyunopenapi.95155.com/save/apis/routerPath";
             // 设置 http 读写超时
             DataExchangeService des = new DataExchangeService(5000, 8000);
             System.out.println("请求地址:" + url);

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyCargoOwnerCapitalInfoMapper.xml

@@ -157,4 +157,81 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+
+
+    <!-- 获得货主银行流水总数 -->
+    <select id="getBankFlowCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        select
+        count(c.id)
+        FROM hy_cargo_owner_capital_info c
+        LEFT JOIN hy_cargo_owner_info co ON co.common_id = c.common_id AND co.delete_flag = '0'
+        LEFT JOIN hy_company_info ho ON ho.id = c.company_id AND ho.delete_flag = '0'
+        LEFT JOIN common_user cu ON cu.id = co.common_id AND cu.delete_flag = '0'
+        LEFT JOIN common_user cs ON cs.id = ho.common_id AND cs.delete_flag = '0'
+        WHERE
+        c.delete_flag = '0'
+        AND (c.types = '提现' OR c.types = '充值')
+        AND c.serial_number !=''
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(co.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(cu.phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(ho.company_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(ho.legal_person_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(cs.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        <if test="startDate != null and startDate != ''">
+            AND (DATE_FORMAT(c.payment_date,"%Y%m%d") >=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND (DATE_FORMAT(c.payment_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+    </select>
+
+    <!-- 货主银行流水列表查询 -->
+    <select id="getBankFlowListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCapitalInfo">
+        SELECT
+        c.id,
+        c.common_id as commonId,
+        c.company_id as companyId,
+        c.serial_number as serialNumber,
+        case when c.company_id is null then co.name else ho.legal_person_name end as cargoOwnerName,
+        case when c.company_id is null then cu.phone else cs.phone end as accountNumber,
+        c.bank_card as bankCard,
+        case when ho.company_name is null then '个人货主' else ho.company_name end as affiliatedEnterprise,
+        c.amount_money as amountMoney,
+        c.types,
+        c.payment_date as paymentDate,
+        c.create_date as createDate
+        FROM hy_cargo_owner_capital_info c
+        LEFT JOIN hy_cargo_owner_info co ON co.common_id = c.common_id AND co.delete_flag = '0'
+        LEFT JOIN hy_company_info ho ON ho.id = c.company_id AND ho.delete_flag = '0'
+        LEFT JOIN common_user cu ON cu.id = co.common_id AND cu.delete_flag = '0'
+        LEFT JOIN common_user cs ON cs.id = ho.common_id AND cs.delete_flag = '0'
+        WHERE
+        c.delete_flag = '0'
+        AND (c.types = '提现' OR c.types = '充值')
+        AND c.serial_number !=''
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(co.name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(cu.phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(ho.company_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(ho.legal_person_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(cs.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        <if test="startDate != null and startDate != ''">
+            AND (DATE_FORMAT(c.payment_date,"%Y%m%d") >=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND (DATE_FORMAT(c.payment_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+        ORDER BY c.payment_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

@@ -130,7 +130,7 @@
                 AND order_status_key = '25'
             </if>
         </if>
-        ORDER BY o.create_date DESC
+        ORDER BY o.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>
@@ -278,7 +278,7 @@
                 AND cargo_owner_status_key = '31'
             </if>
         </if>
-        ORDER BY o.create_date DESC
+        ORDER BY o.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>