提交代码

admin-hanhai-vue/.env

@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_PLATFORM_NAME=布周到管理系统
+VUE_APP_PLATFORM_NAME=布周道管理系统
 # 开启单点登录
 VUE_APP_SSO=false
 # 开启微应用模式

admin-hanhai-vue/public/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>布周到管理系统</title>
+  <title>布周道管理系统</title>
 <!--  <link rel="icon" href="<%= BASE_URL %>logo.png">-->
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <style>
@@ -249,7 +249,7 @@
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 布周到管理系统,请耐心等待
+    <div class="load_title">正在加载 布周道管理系统,请耐心等待
 
     </div>
   </div>

admin-hanhai-vue/src/components/layouts/TabLayout.vue

@@ -177,7 +177,7 @@
 
       // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
       changeTitle(title) {
-        let projectTitle = "布周到管理系统"
+        let projectTitle = "布周道管理系统"
         // 首页特殊处理
         if (this.$route.path === indexKey) {
           document.title = projectTitle

admin-hanhai-vue/src/components/layouts/UserLayout.vue

@@ -4,8 +4,8 @@
       <div class="top">
         <div class="header">
           <a href="/">
-
-            <span class="title">布周到管理系统</span>
+            <img src="~@/assets/logo.png" class="logo" alt="logo" style="margin-top: 5px;">
+            <span class="title">布周道管理系统</span>
           </a>
         </div>
 <!--        <div class="desc">-->

admin-hanhai-vue/src/components/page/GlobalHeader.vue

@@ -17,8 +17,8 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 布周到管理系统</span>
-      <span v-else>布周到管理系统</span>
+      <span v-if="device === 'desktop'">欢迎进入 布周道管理系统</span>
+      <span v-else>布周道管理系统</span>
 
       <user-menu :theme="theme"/>
     </div>

admin-hanhai-vue/src/components/tools/Logo.vue

@@ -21,7 +21,7 @@
     props: {
       title: {
         type: String,
-        default: '布周到',
+        default: '布周道',
         required: false
       },
       showTitle: {

admin-hanhai-vue/src/views/system/ReplaceOrderList.vue

@@ -264,6 +264,17 @@
             dataIndex: 'pic',
             scopedSlots: {customRender: 'imgSlot'}
           },
+          {
+            title:'客户类型',
+            align:"center",
+            dataIndex: 'replaceType',
+            customRender(r,t,index){
+              if(r === 0){
+                return '酒店';
+              }
+              return '水洗店';
+            }
+          },
           {
             title:'客户姓名',
             align:"center",

admin-hanhai-vue/src/views/system/WashOrderList.vue

@@ -262,6 +262,7 @@
             dataIndex: 'pic',
             scopedSlots: {customRender: 'imgSlot'}
           },
+
           {
             title:'客户姓名',
             align:"center",

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -79,6 +79,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/notice/list", "anon");//分类接口
         filterChainDefinitionMap.put("/login/login", "anon");//分类接口
         filterChainDefinitionMap.put("/conf/customer", "anon");//分类接口
+        filterChainDefinitionMap.put("/conf/coupon", "anon");//分类接口
         filterChainDefinitionMap.put("/order/notify", "anon");//支付回调接口
         filterChainDefinitionMap.put("/user/custom", "anon");//支付回调接口
         filterChainDefinitionMap.put("/order/replace/notify", "anon");//支付回调接口

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/conf/service/impl/ConfServiceImpl.java

@@ -32,9 +32,16 @@ public class ConfServiceImpl implements IConfService {
         Integer couponFlag = Integer.parseInt(hotelConfService.getConf("couponFlag"));
         BigDecimal couponPrice = new BigDecimal(hotelConfService.getConf("couponPrice"));
         BigDecimal couponCondition = new BigDecimal(hotelConfService.getConf("couponCondition"));
+
+        Integer leaseCouponFlag = Integer.parseInt(hotelConfService.getConf("leaseCouponFlag"));
+        BigDecimal leaseCouponPrice = new BigDecimal(hotelConfService.getConf("leaseCouponPrice"));
+        BigDecimal leaseCouponCondition = new BigDecimal(hotelConfService.getConf("leaseCouponCondition"));
         map.put("couponFlag",couponFlag);
         map.put("couponPrice",couponPrice);
         map.put("couponCondition",couponCondition);
+        map.put("leaseCouponFlag",leaseCouponFlag);
+        map.put("leaseCouponPrice",leaseCouponPrice);
+        map.put("leaseCouponCondition",leaseCouponCondition);
         return Result.OK(map);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/CreateOrderReq.java

@@ -49,4 +49,5 @@ public class CreateOrderReq {
     @ApiModelProperty(value = "租赁id")
     private String leaseId;
 
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/req/UploadTableclothReq.java

@@ -25,5 +25,7 @@ public class UploadTableclothReq {
     /**分类id*/
     @ApiModelProperty(value = "分类id")
     private String categoryId;
+    @ApiModelProperty(value = "地址id")
+    private String addressId;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java

@@ -62,6 +62,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -537,13 +538,20 @@ public class OrderServiceImpl implements IOrderService {
         String depositPrice1 = hotelConfService.getConf("depositPrice");
         BigDecimal depositPrice = new BigDecimal(depositPrice1);
 
-        //优惠券开关
+        //押金优惠券开关
         Integer couponFlag = Integer.parseInt(hotelConfService.getConf("couponFlag"));
-        //券额
+        //押金券额
         BigDecimal couponPrice = new BigDecimal(hotelConfService.getConf("couponPrice"));
-        //优惠券条件
+        //押金优惠券条件
         BigDecimal couponCondition = new BigDecimal(hotelConfService.getConf("couponCondition"));
 
+        //租金优惠券开关
+        Integer leaseCouponFlag = Integer.parseInt(hotelConfService.getConf("leaseCouponFlag"));
+        //租金券额
+        BigDecimal leaseCouponPrice = new BigDecimal(hotelConfService.getConf("leaseCouponPrice"));
+        //租金优惠券条件
+        BigDecimal leaseCouponCondition = new BigDecimal(hotelConfService.getConf("leaseCouponCondition"));
+
 
         List<HotelOrderDetail> hotelOrderDetails = new ArrayList<>();
         BigDecimal totalPrice = BigDecimal.ZERO;
@@ -632,17 +640,17 @@ public class OrderServiceImpl implements IOrderService {
                     throw new JeecgBootException("还未确认收货，无法水洗");
                 }
 
-                HotelOrderDetail hotelOrderDetail1 = hotelOrderDetailService.lambdaQuery()
+                List<HotelOrderDetail> hotelOrderDetailList = hotelOrderDetailService.lambdaQuery()
                         .eq(HotelOrderDetail::getDelFlag, 0)
                         .eq(HotelOrderDetail::getLeaseId, hotelLeaseLog.getId())
-                        .one();
+                        .list();
 
-                if(hotelOrderDetail1 != null){
+                if(hotelOrderDetailList != null && hotelOrderDetailList.size() > 0){
                     HotelOrder hotelOrder1 = hotelOrderService.lambdaQuery()
                             .eq(HotelOrder::getDelFlag, 0)
                             .eq(HotelOrder::getType, 1)
                             .in(HotelOrder::getStatus, 4, 5, 6, 16)
-                            .eq(HotelOrder::getId, hotelOrderDetail1.getOrderId())
+                            .eq(HotelOrder::getId, hotelOrderDetailList.stream().map(HotelOrderDetail::getOrderId).collect(Collectors.toList()))
                             .one();
                     if(hotelOrder1 != null){
                         throw new JeecgBootException("该租赁正在水洗中");
@@ -716,10 +724,18 @@ public class OrderServiceImpl implements IOrderService {
         hotelOrder.setDiscountPrice(couponPrice);
         hotelOrder.setRentPay(totalRentPrice);
         hotelOrder.setWashPay(totalwashPrice);
-        if(couponFlag == 1){
+        if(createOrderReqs.get(0).getType() == 0 && couponFlag == 1){
+
             if(totalPrice.compareTo(couponCondition) >= 0){
                 totalPrice = totalPrice.subtract(couponPrice);
             }
+        }else if(createOrderReqs.get(0).getType() == 1 && leaseCouponFlag == 1){
+            if(totalRentPrice.compareTo(leaseCouponCondition) >= 0){
+                totalRentPrice = totalRentPrice.subtract(leaseCouponPrice);
+                totalPrice = totalRentPrice.add(totalwashPrice);
+                hotelOrder.setRentPay(totalRentPrice);
+            }
+
         }
         hotelOrder.setOrderPay(totalPrice);
 
@@ -1217,7 +1233,7 @@ public class OrderServiceImpl implements IOrderService {
         }
 
         /*已经处理过订单*/
-        if (hotelOrder.getStatus() !=0){
+        if (hotelOrder.getStatus() !=0 && hotelOrder.getStatus() != 3){
             return "SUCCESS";
         }
 
@@ -1283,7 +1299,7 @@ public class OrderServiceImpl implements IOrderService {
                         .one();
                 /*水洗店*/
                 HotelOrderDetail hotelOrderDetail1 = new HotelOrderDetail();
-                hotelOrderDetail1.setPic(hotelGoods.getPic());
+
                 shopOrder.setUserName(hotelShop.getUserName());
                 shopOrder.setUserPhone(hotelShop.getPhone());
                 shopOrder.setUserAddress(hotelShop.getAddress());
@@ -1293,6 +1309,7 @@ public class OrderServiceImpl implements IOrderService {
                 shopOrder.setStatus(1);
                 shopOrder.setOrderLogId(hotelOrderLog.getId());
                 shopOrder.setWashShopFlag(1);
+                hotelOrderDetail1.setPic(hotelGoods.getPic());
                 hotelOrderDetail1.setGoodsId(hotelGoods.getId());
                 hotelOrderDetail1.setGoodsName(hotelGoods.getName());
                 hotelOrderDetail1.setSkuId(hotelGoodsSku.getId());
@@ -1424,6 +1441,7 @@ public class OrderServiceImpl implements IOrderService {
         }
         List<HotelOrder> hotelOrders = hotelOrderService.lambdaQuery()
                 .eq(HotelOrder::getDelFlag, 0)
+                .eq(HotelOrder::getType,applyRefundOrderReq.getType() == 0?2:1)
                 .eq(HotelOrder::getLeaseId, hotelLeaseLog.getId())
                 .ne(HotelOrder::getStatus, 15)
                 .list();
@@ -1630,6 +1648,80 @@ public class OrderServiceImpl implements IOrderService {
         hotelLeaseLog.setSku(uploadTableclothReq.getLength()+"*"+uploadTableclothReq.getWide());
         hotelLeaseLogService.save(hotelLeaseLog);
 
+        HotelShop hotelShop = hotelShopService.lambdaQuery()
+                .eq(HotelShop::getDelFlag, 0)
+                .eq(HotelShop::getId, hanHaiMember.getShopId())
+                .one();
+
+        HotelAddress hotelAddress = hotelAddressService.lambdaQuery()
+                .eq(HotelAddress::getId, uploadTableclothReq.getAddressId())
+                .one();
+
+        HotelOrderLog hotelOrderLog = new HotelOrderLog();
+        hotelOrderLog.setOrderPay(BigDecimal.ZERO);
+        hotelOrderLog.setType(0);
+        hotelOrderLog.setUserId(hanHaiMember.getId());
+        hotelOrderLog.setShopId(hotelShop.getUserId());
+        hotelOrderLogService.save(hotelOrderLog);
+
+
+        HotelOrder hotelOrder = new HotelOrder();
+        hotelOrder.setTitle("租赁押金");
+        hotelOrder.setUserName(hotelAddress.getName());
+        hotelOrder.setUserPhone(hotelAddress.getPhone());
+        hotelOrder.setUserAddress(hotelAddress.getAddress()+hotelAddress.getAddressDetail());
+        hotelOrder.setUserId(hanHaiMember.getId());
+        hotelOrder.setType(0);
+        hotelOrder.setStatus(15);
+        hotelOrder.setWashShopFlag(0);
+        hotelOrder.setOrderPay(BigDecimal.ZERO);
+        hotelOrder.setDeposit(BigDecimal.ZERO);
+        hotelOrder.setRentPay(BigDecimal.ZERO);
+        hotelOrder.setWashPay(BigDecimal.ZERO);
+        hotelOrder.setOrderLogId(hotelOrderLog.getId());
+        hotelOrderService.save(hotelOrder);
+
+        HotelOrderDetail hotelOrderDetail = new HotelOrderDetail();
+        hotelOrderDetail.setGoodsName(uploadTableclothReq.getName());
+        hotelOrderDetail.setPic(uploadTableclothReq.getPic());
+        hotelOrderDetail.setSku(hotelLeaseLog.getSku());
+        hotelOrderDetail.setNum(uploadTableclothReq.getNum());
+        hotelOrderDetail.setOrderPay(BigDecimal.ZERO);
+        hotelOrderDetail.setCategoryId(uploadTableclothReq.getCategoryId());
+        hotelOrderDetail.setOrderId(hotelOrder.getId());
+        hotelOrderDetail.setCategoryId(uploadTableclothReq.getCategoryId());
+        hotelOrderDetail.setDeposit(BigDecimal.ZERO);
+        hotelOrderDetailService.save(hotelOrderDetail);
+
+        HotelOrder shopOrder = new HotelOrder();
+        shopOrder.setUserName(hotelShop.getUserName());
+        shopOrder.setUserPhone(hotelShop.getPhone());
+        shopOrder.setUserAddress(hotelShop.getAddress());
+        shopOrder.setUserId(hotelShop.getUserId());
+        shopOrder.setDeposit(hotelOrder.getDeposit());
+        shopOrder.setOrderPay(hotelOrder.getOrderPay());
+        shopOrder.setWashPay(hotelOrder.getWashPay());
+        shopOrder.setRentPay(hotelOrder.getRentPay());
+        shopOrder.setType(0);
+        shopOrder.setStatus(15);
+        shopOrder.setOrderLogId(hotelOrderLog.getId());
+        shopOrder.setWashShopFlag(1);
+        hotelOrderService.save(shopOrder);
+
+        HotelOrderDetail hotelOrderDetail1 = new HotelOrderDetail();
+        hotelOrderDetail.setGoodsName(uploadTableclothReq.getName());
+        hotelOrderDetail.setPic(uploadTableclothReq.getPic());
+        hotelOrderDetail.setSku(hotelLeaseLog.getSku());
+        hotelOrderDetail.setNum(uploadTableclothReq.getNum());
+        hotelOrderDetail.setOrderPay(BigDecimal.ZERO);
+        hotelOrderDetail.setCategoryId(uploadTableclothReq.getCategoryId());
+        hotelOrderDetail.setOrderId(shopOrder.getId());
+        hotelOrderDetail.setCategoryId(uploadTableclothReq.getCategoryId());
+        hotelOrderDetail.setDeposit(BigDecimal.ZERO);
+        hotelOrderDetailService.save(hotelOrderDetail1);
+
+
+
 
         return Result.OK();
     }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -134,7 +134,7 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://124.220.65.222:3306/hotel-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://127.0.0.1:3306/hotel-api?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
           password: m`A_E+`m
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -147,7 +147,7 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 124.220.65.222
+    host: 127.0.0.1
     lettuce:
       pool:
         max-active: -1   #最大连接数据库连接数,设 -1 为没有限制