正则

src/main/java/com/izouma/dingdong/config/Constants.java

@@ -4,6 +4,7 @@ public interface Constants {
 
     public interface Regex {
         String PHONE    = "^1[3-9]\\d{9}$";
+        String PHONE2   = "^\\+((?:9[679]|8[035789]|6[789]|5[90]|42|3[578]|2[1-689])|9[0-58]|8[1246]|6[0-6]|5[1-8]|4[013-9]|3[0-469]|2[70]|7|1)(?:\\W*\\d){0,13}\\d$";
         String USERNAME = "^[_.@A-Za-z0-9-]*$";
         String CHINESE  = "^[\\u4e00-\\u9fa5]+$";
         String ID_NO    = "^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0-2]\\d)|3[0-1])\\d{3}$|^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0-2]\\d)|3[0-1])\\d{3}[0-9xX]$";

src/main/java/com/izouma/dingdong/domain/merchant/Merchant.java

@@ -106,4 +106,7 @@ public class Merchant extends BaseEntity implements Serializable {
      */
     @ApiModelProperty(value = "商家标签", name = "tag")
     private Integer tag;
+
+    @ApiModelProperty(value = "购买口碑联盟", name = "buyAlliance")
+    private Boolean buyAlliance;
 }

src/main/java/com/izouma/dingdong/domain/merchant/MerchantSettings.java

@@ -106,8 +106,8 @@ public class MerchantSettings extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "门头图片", name = "doorHeadImg")
     private String doorHeadImg;
 
-    @ApiModelProperty(value = "购买口碑联盟", name = "buyAlliance")
-    private Boolean buyAlliance;
+//    @ApiModelProperty(value = "购买口碑联盟", name = "buyAlliance")
+//    private Boolean buyAlliance;
 
     @ApiModelProperty(value = "优先级", name = "priority")
     private Integer priority;

src/main/java/com/izouma/dingdong/dto/MerchantDTO.java

@@ -62,7 +62,7 @@ public class MerchantDTO implements Serializable {
         automaticOrder = merchantSettings.getAutomaticOrder();
         doorHeadImg = merchantSettings.getDoorHeadImg();
         promo = merchant.getPromo();
-        buyAlliance = merchantSettings.getBuyAlliance();
+        buyAlliance = merchant.getBuyAlliance();
         monthSales = merchant.getMonthSales();
         goodNum = merchant.getGoodNum();
         badNum = merchant.getBadNum();

src/main/java/com/izouma/dingdong/repo/merchant/MerchantRepo.java

@@ -27,4 +27,6 @@ public interface MerchantRepo extends JpaRepository<Merchant, Long>, JpaSpecific
 
     List<Merchant> findAllByEstablishTimeAfter(LocalDateTime dateTime);
 
+    //按口碑联盟筛选
+    List<Merchant> findAllByBuyAllianceTrue();
 }

src/main/java/com/izouma/dingdong/service/merchant/MerchantService.java

@@ -90,6 +90,7 @@ public class MerchantService {
 
         merchant.setEnabled(true);
         merchant.setBlacklist(false);
+        merchant.setBuyAlliance(false);
         merchant = merchantRepo.save(merchant);
 
         //dto转merchantSettings实体
@@ -112,7 +113,7 @@ public class MerchantService {
         //优先级
         merchantSettings.setPriority(1);
         //购买口碑联盟
-        merchantSettings.setBuyAlliance(false);
+//        merchantSettings.setBuyAlliance(false);
         merchantSettingsRepo.save(merchantSettings);
 
         //新建 系统预制分类：好评热销/折扣/点单必读
@@ -338,4 +339,5 @@ public class MerchantService {
 
         return list;
     }
+
 }

src/main/java/com/izouma/dingdong/web/OrderInfoController.java

@@ -183,7 +183,7 @@ public class OrderInfoController extends BaseController {
     /*
     骑手强制已到店，已送达
      */
-    @GetMapping("/")
+    @GetMapping("/mandatory")
     @ApiOperation("强制")
     public void mandatory(Long orderId, RiderStatus status) {
         orderInfoService.mandatory(orderId, status);

src/main/java/com/izouma/dingdong/web/SmsController.java

@@ -48,7 +48,7 @@ public class SmsController {
      */
     @GetMapping("/tencentSend")
     public String tencentSend(@RequestParam String phone, String templateId) {
-        if (!Pattern.matches(Constants.Regex.PHONE, phone)) {
+        if (!Pattern.matches(Constants.Regex.PHONE2, phone)) {
             throw new BusinessException("请输入正确的手机号");
         }
         return tencentSmsService.sendVerify(phone, templateId);

src/main/java/com/izouma/dingdong/web/merchant/MerchantController.java

@@ -121,5 +121,11 @@ public class MerchantController extends BaseController {
     public List<HeatMapDTO> heatMap(Double longitude, Double latitude) {
         return merchantService.heatMap(longitude, latitude);
     }
+
+    @GetMapping("/bannerMer")
+    @ApiOperation("banner的商家列表")
+    public List<Merchant> bannerMer() {
+        return merchantRepo.findAllByBuyAllianceTrue();
+    }
 }
 

src/main/vue/src/components/EmilButton.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-button @click="showDialog=true"
-                   type="danger">发送邮件
+                   type="warning">发送邮件
         </el-button>
          <el-dialog
                  :visible.sync="showDialog" width="500px">

src/main/vue/src/views/OrderInfoList.vue

@@ -217,14 +217,20 @@
                 if (this.$route.query.userId != null) {
                     userId = this.$route.query.userId;
                 }
+                let merchantId = null;
+                if (this.$route.query.merchantId != null) {
+                    merchantId = this.$route.query.merchantId;
+                }
                 return {
                     search: this.search,
                     query: {
                         status: this.status,
                         userId: userId,
+                        merchantId: merchantId,
                     },
                     sort: "createdAt,desc"
-                };
+                }
+                    ;
 
             },
             toggleMultipleMode(multipleMode) {

src/main/vue/src/views/backstage/BannerEdit.vue

@@ -64,6 +64,7 @@
                         this.$message.error(e.error);
                     });
             }
+
         },
         data() {
             return {

src/main/vue/src/views/backstage/PromoteEdit.vue

@@ -2,8 +2,12 @@
     <div class="edit-view">
         <el-form :model="formData" :rules="rules" ref="form" label-width="108px" label-position="right" size="small"
                  style="max-width: 500px;">
-            <el-form-item prop="merchantId" label="商家ID">
-                <el-input v-model="formData.merchantId"></el-input>
+            <el-form-item prop="merchant" label="商家">
+                <el-select v-model="merchant">
+                    <el-option v-for="item in merchant" :label="item.showName"
+                               :value="item.id" :key="item.id">
+                    </el-option>
+                </el-select>
             </el-form-item>
             <el-form-item prop="action" label="位置">
                 <el-select v-model="formData.action">
@@ -55,12 +59,22 @@
                         this.$message.error(e.error);
                     });
             }
+            this.$http
+                .get('merchant/bannerMer')
+                .then(res => {
+                    this.merchant = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
         },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {},
+                merchant: [],
                 actionOption: [
                     {"label": "主推广位", "value": 1},
                     {"label": "副推广位", "value": 2}]

src/main/vue/src/views/merchant/GoodsEdit.vue

@@ -30,9 +30,6 @@
                <!-- <el-input-number type="number" v-model="formData.totalSales" disabled> </el-input-number>-->
                 <el-card class="rt-card" shadow="hover">总销量 : {{formData.totalSales}} &nbsp;&nbsp; ( 库存 : {{formData.inventory}} )</el-card>
             </el-form-item>
-            <!--                <el-form-item prop="daySales" label="日销售">
-                                        <el-input-number type="number" v-model="formData.daySales"></el-input-number>
-                            </el-form-item>-->
             <el-form-item prop="likes" label="点赞">
                 <el-input-number type="number" v-model="formData.likes" disabled></el-input-number>
             </el-form-item>
@@ -86,10 +83,10 @@
             <el-form-item>
                 <!--<el-button @click="onSave" :loading="saving"
                            type="primary">保存
-                </el-button>
+                </el-button>-->
                 <el-button @click="onDelete" :loading="saving"
                            type="danger" v-if="formData.id">删除
-                </el-button>-->
+                </el-button>
                 <el-button @click="$router.go(-1)">返回</el-button>
             </el-form-item>
         </el-form>

src/main/vue/src/views/merchant/GoodsList.vue

@@ -92,15 +92,15 @@
                     label="操作"
                     align="center"
                     fixed="right"
-                    min-width="240">
+                    min-width="160">
                 <template slot-scope="{row}">
                      <el-button @click="editRow(row)" type="primary" size="mini" plain>详情</el-button>
                     <el-button @click="take(row)" type="warning" size="mini" plain v-if="row.status === 'PASS'">
                         {{row.takeOff?'上架':'下架'}}
                     </el-button>
-                    <el-button @click="deleteRow(row)" type="info" size="mini" plain v-if="row.status !== 'PENDING'">
+                    <!--<el-button @click="deleteRow(row)" type="info" size="mini" plain v-if="row.status !== 'PENDING'">
                         删除
-                    </el-button>
+                    </el-button>-->
                     <el-button
                             v-if="row.status === 'PENDING'"
                             :loading="row.loading"

src/main/vue/src/views/merchant/MerchantComplaintEdit.vue

@@ -2,6 +2,17 @@
     <div class="edit-view">
         <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
                  style="max-width: 500px;">
+            <el-form-item prop="img" label="图片">
+                <el-image style="width: 120px; height: 120px"
+                          :src="formData.merchantComplaint.img" fit="cover"
+                          :preview-src-list="[formData.merchantComplaint.img]">
+                    <div slot="error">
+                        <el-image style="width: 120px; height: 120px"
+                                  src="https://idingdong.oss-cn-hangzhou.aliyuncs.com/image/2020-08-07-17-26-23hRwKPxhh.gif"
+                                  fit="cover"/>
+                    </div>
+                </el-image>
+            </el-form-item>
             <el-form-item prop="userNickname" label="投诉用户">
                 <el-card shadow="hover" class="rt-card">{{formData.userNickname}}</el-card>
             </el-form-item>
@@ -12,11 +23,6 @@
             <el-form-item prop="merchantComplaint.type" label="投诉类型">
                 <el-card shadow="hover" class="rt-card">{{formData.merchantComplaint.type}}</el-card>
             </el-form-item>
-            <el-form-item prop="img" label="图片">
-                    <el-image style="width: 80px; height: 80px"
-                              :src="formData.merchantComplaint.img" fit="cover"
-                              :preview-src-list="[formData.merchantComplaint.img]"></el-image>
-            </el-form-item>
             <el-form-item prop="content" label="具体内容">
                 <el-card class="rt-card" shadow="hover" >{{formData.merchantComplaint.content}}</el-card>
             </el-form-item>

src/main/vue/src/views/merchant/MerchantList.vue

@@ -93,10 +93,10 @@
             </el-table-column>-->
             <el-table-column label="操作" align="center" fixed="right" min-width="250">
                 <template slot-scope="{ row }">
-                    <el-button @click="showDrawer(row)" type="success" size="mini" plain>详情</el-button>
+                    <el-button @click="showDrawer(row)" type="primary" size="mini" plain>详情</el-button>
                     <el-button @click="showReport(row)" type="primary" size="mini" plain v-if="row.isPass">报表
                     </el-button>
-                    <el-button @click="showAppraisal(row)" type="primary" size="mini" plain v-if="row.isPass">评价
+                    <el-button @click="showAppraisal(row)" type="success" size="mini" plain v-if="row.isPass">评价
                     </el-button>
                     <el-button
                             v-if="row.status === 'PENDING'"
@@ -145,7 +145,7 @@
             <div class="info-content">
                 <div class="info-item">
                     Logo/banner：
-                    <el-image style="width: 30px; height: 30px; margin-right: 8px""
+                    <el-image style="width: 30px; height: 30px; margin-right: 8px"
                               :src="formData.logo" fit="cover"
                               :preview-src-list="[formData.logo]"/>
                     <el-image style="width: 60px; height: 30px"
@@ -188,6 +188,9 @@
                               :src="verified.handheldIdNo" fit="fit"
                               :preview-src-list="[verified.handheldIdNo]"/>
                 </div>-->
+                <el-button @click="showOrder(formData)"
+                           type="success" plain>订单
+                </el-button>
                 <el-button @click="editRow(formData)" type="primary" size="mini" plain>编辑</el-button>
                 <el-button @click="deleteRow(formData)" type="danger" size="mini" plain>删除</el-button>
             </div>
@@ -204,9 +207,6 @@
             </el-table>
         </el-dialog>
 
-        <!--  <report-dialog :visible.sync="showReportDialog"
-                             v-model="formData"></report-dialog>
-  -->
     </div>
 </template>
 <script>
@@ -295,10 +295,6 @@
             }
         },
         methods: {
-            /*            showReport(row) {
-                            this.showReportDialog = true;
-                            this.$route.query.mid = row.mid;
-                        },*/
             picList(row) {
                 if (row) {
                     return row.split(",");
@@ -499,7 +495,6 @@
                         this.$message.error(e.error);
                     });*/
             },
-
             showAppraisal(row) {
                 this.$router.push({
                     path: "/appraisalList",
@@ -520,7 +515,15 @@
                     .catch(e => {
                         console.log(e);
                     });
-            }
+            },
+            showOrder(row) {
+                this.$router.push({
+                    path: "/orderInfoList",
+                    query: {
+                        merchantId: row.mid,
+                    }
+                });
+            },
 
         },
         components: {

src/main/vue/src/views/rider/RiderEdit.vue

@@ -1,9 +1,9 @@
 <template>
     <div class="edit-view">
-        <el-form :model="formData" :rules="rules" ref="form" label-width="66px" label-position="right" size="small"
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
                  style="max-width: 500px;">
-            <el-form-item prop="userId" label="用户ID">
-                <el-input v-model="formData.userId"></el-input>
+            <el-form-item prop="userId" label="昵称">
+                <el-input v-model="formData.user.nickname"></el-input>
             </el-form-item>
             <el-form-item prop="jobNumber" label="工号">
                 <el-input v-model="formData.jobNumber"></el-input>
@@ -15,14 +15,26 @@
                 <el-input v-model="formData.transportation"></el-input>
             </el-form-item>
             <el-form-item prop="transportationImg" label="交通工具图片">
-                <el-image style="width: 100px; height: 100px"
+                <el-image style="width: 120px; height: 120px"
                           :src="formData.transportationImg" fit="cover"
-                          :preview-src-list="[formData.transportationImg]"></el-image>
+                          :preview-src-list="[formData.transportationImg]">
+                    <div slot="error">
+                        <el-image style="width: 120px; height: 120px"
+                                  src="https://idingdong.oss-cn-hangzhou.aliyuncs.com/image/2020-08-07-17-26-23hRwKPxhh.gif"
+                                  fit="cover"/>
+                    </div>
+                </el-image>
             </el-form-item>
             <el-form-item prop="driverLicenseImg" label="驾照照片">
-                <el-image style="width: 100px; height: 100px"
+                <el-image style="width: 120px; height: 120px"
                           :src="formData.driverLicenseImg" fit="cover"
-                          :preview-src-list="[formData.driverLicenseImg]"></el-image>
+                          :preview-src-list="[formData.driverLicenseImg]">
+                    <div slot="error">
+                        <el-image style="width: 120px; height: 120px"
+                                  src="https://idingdong.oss-cn-hangzhou.aliyuncs.com/image/2020-08-07-17-26-23hRwKPxhh.gif"
+                                  fit="cover"/>
+                    </div>
+                </el-image>
             </el-form-item>
             <!--               <el-form-item prop="money" label="货币">
                                         <el-input-number type="number" v-model="formData.user.money"></el-input-number>
@@ -47,12 +59,12 @@
                         </el-form-item>-->
 
             <el-form-item>
-                <el-button @click="onSave" :loading="saving"
+                <!--<el-button @click="onSave" :loading="saving"
                            type="primary">保存
-                </el-button>
-                <el-button @click="onDelete" :loading="saving"
+                </el-button>-->
+                <!--<el-button @click="onDelete" :loading="saving"
                            type="danger" v-if="formData.id">删除
-                </el-button>
+                </el-button>-->
 
                 <black-button></black-button>
 
@@ -83,7 +95,9 @@
         data() {
             return {
                 saving: false,
-                formData: {},
+                formData: {
+                    user: {}
+                },
                 rules: {},
             }
         },

src/main/vue/src/views/rider/RiderList.vue

@@ -95,7 +95,7 @@
                     min-width="200">
                 <template slot-scope="{row}">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
-                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                    <!--<el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>-->
                     <el-button
                             v-if="row.status === 'PENDING'"
                             :loading="row.loading"
@@ -115,7 +115,7 @@
                     >拒绝
                     </el-button
                     >
-                    <el-button @click="showAppraisal(row)" type="primary" size="mini" plain v-if="row.status==='PASS'">评价</el-button>
+                    <el-button @click="showAppraisal(row)" type="success" size="mini" plain v-if="row.status==='PASS'">评价</el-button>
                 </template>
             </el-table-column>
         </el-table>

src/main/vue/src/views/user/UserEdit.vue

@@ -9,16 +9,14 @@
                           :preview-src-list="[formData.avatar]">
 
                     <div slot="error">
-                    <el-image style="width: 120px; height: 120px"
-
-                              src="https://idingdong.oss-cn-hangzhou.aliyuncs.com/image/2020-08-07-17-26-23hRwKPxhh.gif"
-                              fit="cover"></el-image>
+                        <el-image style="width: 120px; height: 120px"
+                                  src="https://idingdong.oss-cn-hangzhou.aliyuncs.com/image/2020-08-07-17-26-23hRwKPxhh.gif"
+                                  fit="cover"/>
                     </div>
                 </el-image>
             </el-form-item>
             <el-form-item prop="username" label="用户名">
                 <el-input v-model="formData.username" readonly></el-input>
-                <!--                <el-card>{{formData.username}}</el-card>-->
             </el-form-item>
             <el-form-item prop="nickname" label="昵称">
                 <el-input v-model="formData.nickname" readonly></el-input>
@@ -114,7 +112,7 @@
                     identity: 'USER',
                 },
                 rules: {
-                    avatar: [
+                    /*avatar: [
                         {
                             required: true,
                             regexp: /^[_.@A-Za-z0-9-]*$/,
@@ -128,23 +126,22 @@
                     nickname: [
                         {required: true, message: '请输入昵称', trigger: 'blur'},
                     ],
-                    /*           password: [
+                    /!*           password: [
                                    {required: true, message: '请输入密码', trigger: 'blur'},
-                               ],*/
+                               ],*!/
                     phone: [
                         {
                             regexp: /^1[3-9]\d{9}$/,
                             message: '请输入正确的手机号',
                             trigger: 'blur',
                         },
-                    ],
+                    ],*/
                     /*                authorities: [
                                         { required: true, message: '请选择角色', trigger: 'blur' },
                                     ],*/
                 },
                 dialogTableCoupon: false,
                 coupons: [],
-                // authorities: [],
                 dialogTableOrder: false,
                 orders: [],
                 grandTotal: 0,
@@ -291,4 +288,7 @@
         margin: 10px;
         float: right
     }
+    .rt-card /deep/ .el-card__body {
+        padding: 3px 15px !important;
+    }
 </style>

src/main/vue/src/views/user/UserList.vue

@@ -49,7 +49,7 @@
                 <template slot-scope="{row}">
                     <el-button @click="editRow(row)" type="primary" size="mini"
                         plain>详情</el-button>
-                    <el-button @click="showAppraisal(row)"
+                    <el-button @click="showOrder(row)"
                                type="success" plain>订单
                     </el-button>
                 </template>
@@ -156,7 +156,7 @@ export default {
         operation2() {
             this.$message("操作2");
         },
-        showAppraisal(row) {
+        showOrder(row) {
             this.$router.push({
                 path: "/orderInfoList",
                 query: {

src/test/java/com/izouma/dingdong/service/OrderInfoServiceTest.java

@@ -1,5 +1,7 @@
 package com.izouma.dingdong.service;
 
+import com.izouma.dingdong.dto.UserOrderDTO;
+import com.izouma.dingdong.enums.PayMethod;
 import com.izouma.dingdong.enums.RefundReason;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,7 +22,17 @@ public class OrderInfoServiceTest {
 
     @Test
     public void test1() {
-        orderInfoService.merReceiveOrder(1870L, true);
+        orderInfoService.merReceiveOrder(2177L, true);
+    }
+
+    @Test
+    public void test2() {
+        UserOrderDTO build = UserOrderDTO.builder()
+                .shoppingCartId(2055L)
+                .payMethod(PayMethod.ALI_PAY)
+                .addressId(2042L)
+                .build();
+        orderInfoService.userOrder(build);
     }
 
 }

src/test/java/com/izouma/dingdong/service/sms/TencentSmsTest.java

@@ -1,4 +1,5 @@
 package com.izouma.dingdong.service.sms;
+import com.izouma.dingdong.config.Constants;
 import com.izouma.dingdong.exception.BusinessException;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
@@ -12,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.regex.Pattern;
+
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -58,7 +61,8 @@ public class TencentSmsTest {
     @Test
     public void test1(){
       // smsService.pullSmsSend("+8613182976895");
-        System.out.println(smsService.sendVerify("+8618205083565","674851"));
+//        System.out.println(smsService.sendVerify("+8618205083565","674851"));
+        System.out.println(Pattern.matches(Constants.Regex.PHONE2, "+8618205083565"));
 
     }
 }