提交一把订单

jiangping

2025-06-16 cd41350122ad79f50a3090b0e41e537e4b5cdb0d

提交一把订单

 company/package.json

@@ -6,6 +6,7 @@
    "serve": "vue-cli-service serve",
    "serveshop": "vue-cli-service serve --mode developmentShop",
    "servecom": "vue-cli-service serve --mode developmentCom",
    "servecompro": "vue-cli-service serve --mode productionCom",
    "test": "vue-cli-service serve --mode test",
    "testshop": "vue-cli-service serve --mode testShop",
    "testcom": "vue-cli-service serve --mode testCom",

 company/src/components/business/OperaSolutionsDescWindow.vue

@@ -10,10 +10,10 @@
        <div class="info">
            <div class="info_list">
                <div class="info_list_item">
                    <div class="info_list_item_label">子方案：</div>
                    <div class="info_list_item_label">{{userInfo.type!=1?'子方案：':'方案：'}}</div>
                    <div class="info_list_item_val">{{form.name}}</div>
                </div>
                <div class="info_list_item">
                <div class="info_list_item" v-if="userInfo.type !== 1">
                    <div class="info_list_item_label">主方案：</div>
                    <div class="info_list_item_val"><a @click="$refs.operaSolutionsBaseDescWindow.open('主方案详情', { id: form.parentId })" style="cursor: pointer;color: #2E68EC;">{{form.solutionBaseName}}</a></div>
                </div>

 company/src/views/business/solutions.vue

@@ -90,7 +90,7 @@
                    fixed="right"
                >
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.OperaSolutionsDescWindow.open('子方案详情', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">查看详情</el-button>
                        <el-button type="text" @click="$refs.OperaSolutionsDescWindow.open(userInfo.type !== 1?'子方案详情':'方案详情 ', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">查看详情</el-button>
                        <template v-if="userInfo.type !== 1">
                            <el-button type="text" @click="$refs.operaSolutionsWindow.open('编辑子方案', { id: row.id })" icon="el-icon-edit" v-permissions="['business:solutions:update']">修改</el-button>
                        </template>

 server/service/src/main/java/com/doumee/config/shiro/ShiroConfig.java

@@ -89,6 +89,7 @@
        Map<String, String> map = new LinkedHashMap<>();
        // 路径拦截配置
        map.put("/system/login", "anon");
        map.put("/public/testEmail", "anon");
        map.put("/system/loginByPhone", "anon");
        map.put("/system/loginByWxMini", "anon");
        map.put("/system/logout", "anon");

 server/service/src/main/resources/application-dev.yml

@@ -18,11 +18,23 @@
    password: Doumee@168&QWERT
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
#  mail:
#    host: smtp.exmail.qq.com
#    username: jp@doumee.com
#    password: p7iKUE8VvQQpY58S
#    default-encoding: UTF-8
#    properties:
#      mail:
#        smtp:
#          auth: true
#        starttls:
#          enable: true
#          required: true
  mail:
    host: smtp.exmail.qq.com
    username: jp@doumee.com
    password: p7iKUE8VvQQpY58S
    default-encoding: UTF-8
    host: smtp.exmail.qq.com
    username: kefu@yyb.red
    password: 5CGaprcdshS7bHaM
    properties:
      mail:
        smtp:

 server/service/src/main/resources/application-pro.yml

@@ -21,13 +21,15 @@
  mail:
    default-encoding: UTF-8
    host: smtp.exmail.qq.com
    username: service@yyb.red
    password: yyb@2025
    port: 587
    username: kefu@yyb.red
    password: 5CGaprcdshS7bHaM
    properties:
      mail:
        smtp:
          auth: true
        starttls:
          enable: true
          required: true

  redis:
    #    database: 0

 server/service/src/main/resources/application-test.yml

@@ -19,9 +19,17 @@
    driver-class-name: com.mysql.cj.jdbc.Driver
    type: com.alibaba.druid.pool.DruidDataSource
  mail:
    default-encoding: UTF-8
    host: smtp.exmail.qq.com
    username: jp@doumee.com
    password: Jiangping0427
    username: kefu@yyb.red
    password: 5CGaprcdshS7bHaM
    properties:
      mail:
        smtp:
          auth: true
        starttls:
          enable: true
          required: true
  redis:
    #    database: 0
    host: 127.0.0.1

 server/shop/src/main/java/com/doumee/api/common/PublicController.java

@@ -5,9 +5,12 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelToPdfTool;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.service.business.third.EmailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -15,10 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
@@ -47,12 +47,20 @@

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private EmailService emailService;
    @ApiOperation("测试")
    @PostMapping("/testPdf")
    public String testPdf(@RequestParam Map<String,String> req, HttpServletResponse response) {
        ExcelToPdfTool.excelToPdf(req.get("f1"),req.get("f2"));
        return JSONObject.toJSONString(req);
    }
    @ApiOperation("测试邮箱")
    @PostMapping("/testEmail")
    public ApiResponse<Boolean> testEmail(@RequestBody SmsEmail smsEmail, HttpServletResponse response) {
        boolean result= emailService.sendEmail(smsEmail.getEmail(),smsEmail.getTitle(),smsEmail.getContent(),smsEmail.getFileList());
        return ApiResponse.success(result);
    }

    @ApiOperation(value = "上传", notes = "上传", httpMethod = "POST", position = 6)
    @ApiImplicitParams({