1

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

@@ -51,6 +51,18 @@ public class HyCargoOwnerCapitalInfoController {
         return hyCargoOwnerCapitalInfoService.withdrawal(hyCargoOwnerCapitalInfo);
     }
 
+    /**
+     * 充值
+     *
+     * @param hyCargoOwnerCapitalInfo
+     * @return
+     */
+    @Log(title = "充值")
+    @PostMapping("/api/recharge")
+    public String recharge(@RequestBody HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo) {
+        return hyCargoOwnerCapitalInfoService.recharge(hyCargoOwnerCapitalInfo);
+    }
+
     /**
      * 详情
      *

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

@@ -87,6 +87,10 @@ public class HyCargoOwnerCapitalInfo extends BaseModel<HyCargoOwnerCapitalInfo>
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date paymentDate;
+    /**
+     * 充值截图
+     */
+    private String rechargeUrl;
     /**
      * 状态key（1审核中3已驳回5已通过7已到账）
      */
@@ -122,7 +126,7 @@ public class HyCargoOwnerCapitalInfo extends BaseModel<HyCargoOwnerCapitalInfo>
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private String endDate;
     /**
-     * 提现标识（1个人2企业）
+     * 提现（充值）标识（1个人2企业）
      */
     @TableField(exist = false)
     private String flag;
@@ -131,6 +135,11 @@ public class HyCargoOwnerCapitalInfo extends BaseModel<HyCargoOwnerCapitalInfo>
      */
     @TableField(exist = false)
     private String accountId;
+    /**
+     * 充值账户id
+     */
+    @TableField(exist = false)
+    private String rechargeId;
     /**
      * 批量审核list
      */

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

@@ -325,6 +325,11 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
      */
     @TableField(exist = false)
     private String cargoOwnerPortrait;
+    /**
+     * 货主真实姓名
+     */
+    @TableField(exist = false)
+    private String cargoOwnerReallyName;
 
     /**
      * 审核标识

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

@@ -31,6 +31,13 @@ public interface IHyCargoOwnerCapitalInfoService extends IService<HyCargoOwnerCa
      */
     String withdrawal(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo);
 
+    /**
+     * 充值
+     * @param hyCargoOwnerCapitalInfo
+     * @return
+     */
+    String recharge(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo);
+
     /**
      * 详情
      * @param hyCargoOwnerCapitalInfo

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

@@ -18,6 +18,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -114,6 +115,46 @@ public class HyCargoOwnerCapitalInfoServiceImpl extends ServiceImpl<HyCargoOwner
     }
 
 
+    /**
+     * 充值
+     * @param hyCargoOwnerCapitalInfo
+     * @return
+     */
+    @Override
+    public String recharge(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo){
+        //新增账单信息
+        hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
+        hyCargoOwnerCapitalInfo.setTypes("充值");
+        hyCargoOwnerCapitalInfo.setStatusKey(StatusEnum.RECEIVED.getFlag());
+        hyCargoOwnerCapitalInfo.setStatus(StatusEnum.RECEIVED.getName());
+        hyCargoOwnerCapitalInfo.setPaymentDate(new Date());
+        boolean one = this.insert(hyCargoOwnerCapitalInfo);
+        if ("1".equals(hyCargoOwnerCapitalInfo.getFlag())){
+            //查询个人货主信息
+            HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectById(hyCargoOwnerCapitalInfo.getRechargeId());
+            Double d = hyCargoOwnerInfo.getAccountBalance();
+            hyCargoOwnerInfo.setAccountBalance(d + hyCargoOwnerCapitalInfo.getAmountMoney());
+            boolean two = cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
+            if (one && two){
+                return "ok";
+            }else {
+                return "ng";
+            }
+        }else {
+            //查询企业信息
+            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(hyCargoOwnerCapitalInfo.getRechargeId());
+            Double d = hyCompanyInfo.getAccountBalance();
+            hyCompanyInfo.setAccountBalance(d + hyCargoOwnerCapitalInfo.getAmountMoney());
+            boolean two = companyInfoService.updateById(hyCompanyInfo);
+            if (one && two){
+                return "ok";
+            }else {
+                return "ng";
+            }
+        }
+    }
+
+
     /**
      * 详情
      * @param hyCargoOwnerCapitalInfo

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

@@ -1178,7 +1178,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         }
         //判断是否已抢过单
         List<OrderInfo> orderInfoList1 = orderInfoService.selectList(new EntityWrapper<OrderInfo>().eq("common_id", publishTaskInfo.getDriverCommonId())
-                .eq("cargo_common_id", publishTaskInfo.getCommonId()).eq("delete_flag", "0").orderBy("create_date", false));
+                .eq("task_id",publishTaskInfo.getId()).eq("cargo_common_id", publishTaskInfo.getCommonId()).eq("delete_flag", "0").orderBy("create_date", false));
         if (!CollectionUtils.isEmpty(orderInfoList1)) {
             boolean order = "1".equals(orderInfoList1.get(0).getCargoOwnerStatusKey());
             if (order) {

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

@@ -35,6 +35,7 @@
         amount_money as amountMoney,
         order_id as orderId,
         order_no as orderNo,
+        recharge_url as rechargeUrl,
         status_key as statusKey,
         status,
         create_date as createDate
@@ -202,6 +203,7 @@
         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.recharge_url as rechargeUrl,
         c.types,
         c.payment_date as paymentDate,
         c.create_date as createDate

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

@@ -128,7 +128,7 @@
         COUNT(p.id)
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id
-        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id
+        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id and co.comp_id = p.comp_id
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
         AND p.show_hide = '1'
@@ -215,10 +215,11 @@
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
         case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
+        c.name AS cargoOwnerReallyName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id
-        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id
+        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id and co.comp_id = p.comp_id
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -299,10 +300,11 @@
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
         case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
+        c.name AS cargoOwnerReallyName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id
-        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id
+        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id and co.comp_id = p.comp_id
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -395,10 +397,11 @@
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
         case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
+        c.name AS cargoOwnerReallyName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id
-        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id
+        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id and co.comp_id = p.comp_id
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -490,10 +493,11 @@
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
         case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
+        c.name AS cargoOwnerReallyName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id
-        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id
+        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id and co.comp_id = p.comp_id
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -574,10 +578,11 @@
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
         case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
+        c.name AS cargoOwnerReallyName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id
-        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id
+        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id and co.comp_id = p.comp_id
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -666,10 +671,11 @@
         p.create_date AS createDate,
         c.phone AS cargoOwnerPhone,
         case when c.sex = '男' then CONCAT(c.call,'先生') else CONCAT(c.call,'女士') end as cargoOwnerName,
+        c.name AS cargoOwnerReallyName,
         cu.avatar_url as cargoOwnerPortrait
         FROM hy_publish_task_info p
         LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id
-        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id
+        LEFT JOIN hy_cargo_owner_comp_info co on co.common_id = p.common_id and co.comp_id = p.comp_id
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'