支付宝支付

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -297,16 +297,11 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
         BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
         AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
 		//SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
-//		AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
-//		model.setSubject(orderPayVo.getBody());
-//		model.setOutTradeNo(orderPayVo.getOrderNo());
-//		model.setTimeoutExpress("30m");
-//		model.setTotalAmount(realAmount.toString());
-//		model.setProductCode("QUICK_MSECURITY_PAY");
-//		request.setBizModel(model);
         request.setBizContent("{" +
+                "\"timeout_express\":\"30m\"," +
                 "\"total_amount\":\"" + realAmount.toString() + "\"," +
                 "\"subject\":\"" + orderPayVo.getSubject() + "\"," +
+                "\"body\":\"" + orderPayVo.getBody() + "\"," +
                 "\"out_trade_no\":\"" + orderPayVo.getTradeNo() + "\"" +
                 "  }");
 		request.setNotifyUrl(orderPayVo.getNotifyUrl());
@@ -329,17 +324,6 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
         AlipayFundAuthOrderAppFreezeRequest request = new AlipayFundAuthOrderAppFreezeRequest();
         AlipayFundAuthOrderAppFreezeModel model = new AlipayFundAuthOrderAppFreezeModel();
         BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
-//        model.setOrderTitle(orderPayVo.getSubject());
-//        model.setOutOrderNo(orderPayVo.getTradeNo());//替换为实际订单号
-//        model.setOutRequestNo(orderPayVo.getTradeNo());//替换为实际请求单号，保证每次请求都是唯一的
-//        model.setPayeeUserId(SystemConfig.APP_ID);//payee_user_id,Payee_logon_id不能同时为空
-//        model.setProductCode("PRE_AUTH_ONLINE");//PRE_AUTH_ONLINE为固定值，不要替换
-//        model.setAmount(realAmount.toString());
-//        //需要支持信用授权，该字段必传
-//        //model.setExtraParam("{\"category\":\"xxx\",\"outStoreCode\":\"charge001\",\"outStoreAlias\":\"充电桩北京路点\"}"); //outStoreAlias将在用户端信用守护、支付信息、账单详情页展示
-//        //选填字段，指定支付渠
-//         model.setEnablePayChannels("[{\"payChannelType\":\"PCREDIT_PAY\"},{\"payChannelType\":\"MONEY_FUND\"}]");
-//        request.setBizModel(model);
         request.setBizContent("{" +
                 "\"auth_code\":\"" + orderPayVo.getTradeNo() + "\"," +
                 "\"auth_code_type\":\"bar_code\"," +
@@ -347,6 +331,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
                 "\"out_request_no\":\"" + orderPayVo.getOrderNo() + "\"," +
                 "\"order_title\":\"" + orderPayVo.getSubject() + "\"," +
                 "\"product_code\":\"PRE_AUTH_ONLINE\"," +
+                 "\"pay_timeout\":\"1d\"," +
                 "\"amount\": \"" + realAmount.toString() +"\"  }");
         request.setNotifyUrl(orderPayVo.getNotifyUrl());//异步通知地址，必填，该接口只通过该参数进行异步通知
         AlipayFundAuthOrderAppFreezeResponse response = alipayClient.sdkExecute(request);//注意这里是sdkExecute，可以获取签名参数

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/BookType.java

@@ -14,7 +14,9 @@ public enum BookType {
     TOUR(5,"旅游"),
     MAINTAIN(6,"保养"),
     BOOKING(7,"预约中"),
-    DISABLE(8,"禁用")
+    DISABLE(8,"禁用"),
+    CUSTOMER_APPLY(9, "客户用车"),
+    OTHER(10, "其他")
     ;
     /**
      * 编码

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

@@ -47,4 +47,10 @@ public class VehicleBookRecordQueryVo {
      */
     private Integer bookType;
 
+    private Integer zoneId;
+
+    private String[] zoneIds;
+
+    private String[] companyIds;
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1178,9 +1178,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
     }
 
     public ObjectRestResponse<PageDataVO<VehicleAndModelInfoVo>> getVehicle(VehiclePlanDto vehiclePlanDto) {
+        Integer page = vehiclePlanDto.getPage() == null ? 1 :vehiclePlanDto.getPage();
+        Integer limit = vehiclePlanDto.getLimit() == null ? 10 : vehiclePlanDto.getLimit();
+        vehiclePlanDto.setPage(page);
+        vehiclePlanDto.setLimit(limit);
         UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
         if(userDTO == null) {
-            return ObjectRestResponse.succ(new PageDataVO<>());
+            return ObjectRestResponse.createFailedResult(235, "token失效");
         }
         if(vehiclePlanDto.getZoneId() == null) { //默认查出所有权限内的数据
             if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.biz;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.Query;
@@ -16,6 +17,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.BookRecordAccItem;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
+import com.xxfc.platform.vehicle.feign.AdminInfoFeign;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
 import com.xxfc.platform.vehicle.pojo.*;
@@ -39,6 +41,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
+
 @Service
 @Slf4j
 public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, VehicleBookRecord> {
@@ -57,6 +61,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     @Autowired
     private BookRecordAccItemMapper bookRecordAccItemMapper;
 
+    @Autowired
+    AdminInfoFeign adminInfoFeign;
+
     public void save(VehicleBookRecord vehicleBookRecord) {
         insertSelectiveRe(vehicleBookRecord);
     }
@@ -86,6 +93,36 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     public RestResponse<PageDataVO> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
         Integer pageNo = vehicleBookRecordQueryVo.getPage() == null ? 1 : vehicleBookRecordQueryVo.getPage();
         Integer pageSize = vehicleBookRecordQueryVo.getLimit() == null ? 10 : vehicleBookRecordQueryVo.getLimit();
+        UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
+        if(userDTO == null) {
+            return RestResponse.codeAndMessage(235, "token失效");
+        }
+        if(vehicleBookRecordQueryVo.getZoneId() == null) { //默认查出所有权限内的数据
+            if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
+                String zoneId = null;
+                if(StringUtils.isNotBlank(userDTO.getDataZone())) {
+                    if(userDTO.getDataZone().contains(",")) {
+                        zoneId = userDTO.getDataZone();
+                    } else {
+                        zoneId = userDTO.getDataZone() + ",";
+                    }
+                } else {
+                    zoneId = userDTO.getZoneId() + ",";
+                }
+                vehicleBookRecordQueryVo.setZoneIds(zoneId.split(","));
+                String companyId = null;
+                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
+                    if(userDTO.getDataCompany().contains(",")) {
+                        companyId = userDTO.getDataCompany();
+                    } else {
+                        companyId = userDTO.getDataCompany() + ",";
+                    }
+                } else {
+                    companyId = userDTO.getCompanyId() + ",";
+                }
+                vehicleBookRecordQueryVo.setCompanyIds(companyId.split(","));
+            }
+        }
         List<VehicleBookRecordVo> list = mapper.getBookRecord(vehicleBookRecordQueryVo);
         PageHelper.startPage(pageNo,pageSize);
         PageInfo<VehicleBookRecordVo> vehiclePageInfo = new PageInfo<>(list);

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

@@ -389,13 +389,28 @@
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
-            <if test="liftCompany != null">
-                and v1.lift_company = = #{liftCompany}
+            <if test="companyIds != null">
+                and v1.lift_company in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+
             </if>
-            <if test="retCompany != null">
-                and v1.ret_company = = #{retCompany}
+            <if test="zoneIds != null">
+                and bc1.zone_id in
+                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
             </if>
-            and v1.status BETWEEN 1 and 2
+            <choose>
+                <when test="status != null">
+                    and v1.status = #{status}
+                </when>
+                <otherwise>
+                    and v1.status between  1 and 2
+                </otherwise>
+            </choose>
+
         </where>
         order by update_time DESC
     </select>