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

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

@@ -184,12 +184,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 vehicle = restResponse.getData();
             }
             if (vehicle == null) {
-                return ObjectRestResponse.createFailedResult(500, "订单车辆不存在！");
+                return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
             }
                 if( vehicle.getMileageLastUpdate() != null) {
                     //判断车辆公里数
                     if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() <= vehicle.getMileageLastUpdate()) {
-                        return ObjectRestResponse.createFailedResult(500, "请输入车辆仪表盘实际公里数！");
+                        return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc());
                     }
                 }
 
@@ -377,7 +377,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     public boolean getTodayTime(Long time) {
         long current = System.currentTimeMillis();
-        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset() )+ 24 * 60 * 60 * 1000 -1) {
+        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset() ) + 24 * 60 * 60 * 1000 -1) {
             return true;
         }
         return false;

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

@@ -125,7 +125,7 @@ public class AliYunSmsBiz {
                  SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_D);
                  break;
              case 14 :
-                 SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_E);
+                 SmsService.sendTemplateToJson14(phoneNumbers,params,TEMPLATE_ID_PAY_E);
                  break;
              case 15 :
                  SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_F);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/SmsService.java

@@ -178,7 +178,7 @@ public class SmsService {
         //request.setOutId("yourOutId");
         //hint 此处可能会抛出异常，注意catch
         SendSmsResponse  sendSmsResponse = acsClient.getAcsResponse(request);
-        log.info("短信接口返回的数据----------------mobile======"+PhoneNumbers+"----templateParam===="+params);
+        log.info("短信接口返回的数据--templateCode===="+templateCode+"--------mobile======"+PhoneNumbers+"----templateParam===="+params);
         log.info("Code=" + sendSmsResponse.getCode());
         log.info("Message=" + sendSmsResponse.getMessage());
         log.info("RequestId=" + sendSmsResponse.getRequestId());
@@ -192,22 +192,47 @@ public class SmsService {
     }
 
     public  static  void  sendTemplateToJson(String PhoneNumbers,String[] params,String templateCode){
-       try {
-           JSONObject jsonParams=new JSONObject();
-           for (int i=0;i<params.length;i++){
-               String para=params[i];
-               if (para.contains("【")){
-                   para=para.replaceAll("【","");
-               }
-               if (para.contains("】")){
-                   para=para.replaceAll("】","");
-               }
-               jsonParams.put(param+(i+1),para);
-           }
-           sendTemplate(PhoneNumbers,jsonParams.toJSONString(),templateCode);
-       }catch (Exception e){
-           e.printStackTrace();
-       }
+        try {
+            JSONObject jsonParams=new JSONObject();
+            for (int i=0;i<params.length;i++){
+                String para=params[i];
+                if (para.contains("【")){
+                    para=para.replaceAll("【","");
+                }
+                if (para.contains("】")){
+                    para=para.replaceAll("】","");
+                }
+                jsonParams.put(param+(i+1),para);
+            }
+            sendTemplate(PhoneNumbers,jsonParams.toJSONString(),templateCode);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
+    public  static  void  sendTemplateToJson14(String PhoneNumbers,String[] params,String templateCode){
+        try {
+            JSONObject jsonParams=new JSONObject();
+            for (int i=0;i<params.length;i++){
+                String para=params[i];
+                if (para.contains("【")){
+                    para=para.replaceAll("【","");
+                }
+                if (para.contains("】")){
+                    para=para.replaceAll("】","");
+                }
+                if (i>3){
+                    jsonParams.put(param+(i+2),para);
+                }else {
+                    jsonParams.put(param+(i+1),para);
+                }
+
+            }
+            sendTemplate(PhoneNumbers,jsonParams.toJSONString(),templateCode);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
 
     }
 

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

@@ -116,6 +116,34 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
 
         return  ObjectRestResponse.succ();
     }
+
+    //临时数据同步3
+    public ObjectRestResponse synchro3(){
+        List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
+        if (list.size()>0){
+            int num=0;
+            for (BranchCompanyStockInfo companyStockInfo:list){
+                Integer  id=companyStockInfo.getId();
+                Integer balance=companyStockInfo.getBalance();
+                Integer total=companyStockInfo.getTotal();
+                BigDecimal price=companyStockInfo.getPrice();
+                Integer state=companyStockInfo.getState();
+                BranchCompanyStockRight branchCompanyStockRight=stockRightBiz.selectById(id);
+                if (branchCompanyStockRight!=null){
+                    branchCompanyStockRight=new BranchCompanyStockRight();
+                    branchCompanyStockRight.setId(id);
+                    branchCompanyStockRight.setBalance(balance);
+                    branchCompanyStockRight.setStockState(state);
+                    branchCompanyStockRight.setTotal(total);
+                    branchCompanyStockRight.setPrice(price);
+                    stockRightBiz.updateSelectiveById(branchCompanyStockRight);
+                    num++;
+                }
+                log.info("----成功---num=="+num+"---id==="+id);
+            }
+        }
+        return  ObjectRestResponse.succ();
+    }
     //设置基础信息
     public  ObjectRestResponse updCompany(CompanyVo companyVo){
         if (companyVo==null|| StringUtils.isBlank(companyVo.getCompanyName())|| StringUtils.isBlank(companyVo.getName())||

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java

@@ -31,6 +31,12 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
         return baseBiz.synchro2();
     }
 
+    @ApiOperation("同步股权3")
+    @PostMapping("synchro3")
+    public ObjectRestResponse<String> synchro3() {
+        return baseBiz.synchro3();
+    }
+
 
     @ApiOperation("查询公司列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)

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

@@ -53,6 +53,6 @@
                 and (b.`name` like CONCAT('%',#{name},'%') or c.`name` like CONCAT('%',#{name},'%') )
             </if>
         </where>
-       order by b.id desc
+       order by b.upd_time desc
   </select>
 </mapper>
\ No newline at end of file

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

@@ -43,8 +43,7 @@
           </choose>
 
     where
-          vehicle = #{vehicleId} and `year_month`=#{yearMonth} and
-          booked_date &amp; #{andOperationFactor} = #{andOperationRs}
+          vehicle = #{vehicleId} and `year_month`=#{yearMonth}
   </update>
     <update id="updateById" parameterType="com.xxfc.platform.vehicle.entity.VehicleBookInfo">
          update vehicle_book_info set