Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -66,6 +66,16 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
+        Integer companyId=appUserPositionTempDTO.getCompanyId();
+        String companyName=appUserPositionTempDTO.getCompanyName();
+       if (!(companyId!=null&&companyId>0&&StringUtils.isNotBlank(companyName)))
+           return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        BranchCompany branchCompany=vehicleFeign.companyId(companyName);
+        if (branchCompany==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        }
+        companyId=branchCompany.getId();
+        companyName=branchCompany.getName();
         String phone = appUserPositionTempDTO.getPhone();
         Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
         Example example = new Example(AppUserPositionTemp.class);
@@ -82,6 +92,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
         BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
         userPositionTemp.setUserId(userId);
+        userPositionTemp.setCompanyId(companyId);
+        userPositionTemp.setCompanyName(companyName);
         //编辑
         if (id == null || id == 0) {
             insertSelective(userPositionTemp);
@@ -117,10 +129,10 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         }
         if(Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
             if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
-                criteria.andIsNotNull("userId");
+                criteria.andNotEqualTo("userId",0);
             }
             if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) {
-                criteria.andIsNull("userId");
+                criteria.andEqualTo("userId",0);
             }
         }
         example.setOrderByClause("upd_time desc");

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java

@@ -283,9 +283,11 @@ public class OrderMsgBiz {
                     if(null != orvd.getEndCompanyId() && !SYS_FALSE.equals(orvd.getEndCompanyId())) {
 
                         //新的账单 记录 OUT_ORDER_FUND 返回订单款取消订单
+                        //查询 201, "取消订单退款" 并且状态为真
                         OrderAccount orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                             setOrderId(baseOrder.getId());
                             setAccountType(AccountTypeEnum.OUT_ORDER_FUND.getCode());
+                            setAccountStatus(SYS_TRUE);
                         }});
 
                         if(BigDecimal.ZERO.equals(orderAccount.getDeductAmount())) {
@@ -311,8 +313,6 @@ public class OrderMsgBiz {
                             sms2RefundAppUser(BigDecimal.ZERO, orderAccount.getDeductAmount(), orderAccount.getAccountAmount(), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
                         }
 
-
-
                         //后台发送消息(出车人)
                         smsParams.clear();
                         sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, otd, baseOrder, appUserDTO, SmsTemplateDTO.CANCEL_E, smsParams);
@@ -422,9 +422,11 @@ public class OrderMsgBiz {
             OrderAccount orderAccount;
             if(RefundStatusEnum.RESIDUE_ILLEGAL.getCode().equals(baseOrder.getRefundStatus())) {
                 smstype = SmsTemplateDTO.REFUND_A;
+                //查询 203, "部分押金（扣除该扣除的 + 保留违章预备金）" 并且状态为真
                 orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                     setOrderId(baseOrder.getId());
                     setAccountType(AccountTypeEnum.OUT_PART_DEPOSIT.getCode());
+                    setAccountStatus(SYS_TRUE);
                 }});
 
                 OrderAccountDetail oad = JSONUtil.toBean(orderAccount.getAccountDetail(), OrderAccountDetail.class);
@@ -447,9 +449,11 @@ public class OrderMsgBiz {
                 residueAmount = orvd.getReturnPayResidue();
             }else if(RefundStatusEnum.REFUND_DEPOSIT.getCode().equals(baseOrder.getRefundStatus())){
                 smstype = SmsTemplateDTO.REFUND_B;
+                //查询 204, "剩余押金（扣除该扣除的）" 并且状态为真
                 orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                     setOrderId(baseOrder.getId());
                     setAccountType(AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode());
+                    setAccountStatus(SYS_TRUE);
                 }});
                 originalAmount = orderAccount.getOriginalAmount();
                 violateAmount = orderAccount.getDeductAmount();

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
@@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -75,7 +77,10 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         //根据facilitatePhone 查询后台管理系统人员 未完成
         if(StrUtil.isNotBlank(facilitatePhone)) {
             baseOrder.setFacilitatePhone(facilitatePhone);
-            userFeign.getOne(facilitatePhone, null);
+            List<AppUserLogin> appUserDTOList = userFeign.getOne(facilitatePhone, null);
+            if(null != appUserDTOList && appUserDTOList.size() > 0) {
+                baseOrder.setFacilitateId(appUserDTOList.get(0).getId());
+            }
         }
 
         //设置订单号

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -91,6 +91,6 @@
         <if test="cityCode != null">
            AND  `addr_city`=#{cityCode}
         </if>
-        ) AS `cb` ON cb.id = bc.company_base_id ORDER  BY `id`
+        ) AS `cb` ON cb.id = bc.company_base_id ORDER  BY bc.id
     </select>
 </mapper>
\ No newline at end of file