main
13233904609 4 months ago
parent 4bc0498bd4
commit cb22fe49f9

@ -329,6 +329,13 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="24">
<el-form-item label="店铺详情">
<editor v-model="form.mtDetails" :min-height="550"/>
</el-form-item>
</el-col>
</el-row> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"></el-button>
@ -384,7 +391,7 @@ export default {
hideUpload: false,
//
uploadFiles: [],
uploadHeader: { 'Access-Token' : getToken() },
uploadHeader: { 'Access-token' : getToken() },
merchantOptions: [],
//
imagePath: "",

@ -3,8 +3,10 @@ package com.fuint.common.config;
import com.fuint.common.web.AdminUserInterceptor;
import com.fuint.common.web.CommandInterceptor;
import com.fuint.common.web.ClientUserInterceptor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.http.CacheControl;
import org.springframework.web.filter.CharacterEncodingFilter;
import org.springframework.web.servlet.config.annotation.*;
@ -21,8 +23,15 @@ import java.util.concurrent.TimeUnit;
@Configuration
public class WebConfig extends WebMvcConfigurationSupport {
@Value("${images.root}")
private String urlFile;
@Value("${images.path}")
private String imgPath;
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
/** 本地文件上传路径 */
registry.addResourceHandler(imgPath+"**").addResourceLocations("file:" + urlFile+imgPath);
registry.addResourceHandler("/resources/**")
.addResourceLocations("/resources/", "classpath:/other-resources/")
.setCacheControl(CacheControl.maxAge(365, TimeUnit.DAYS))

@ -106,4 +106,7 @@ public class StoreDto implements Serializable {
@ApiModelProperty("最后操作人")
private String operator;
@ApiModelProperty("店铺详情")
private String mtDetails;
}

@ -158,6 +158,7 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
mtStore.setBankCardName(storeDto.getBankCardName());
mtStore.setBankCardNo(storeDto.getBankCardNo());
mtStore.setUpdateTime(new Date());
mtStore.setMtDetails(storeDto.getMtDetails());
if (storeDto.getId() == null) {
mtStore.setCreateTime(new Date());
}

@ -10,8 +10,11 @@ import com.fuint.common.param.OrderListParam;
import com.fuint.common.service.*;
import com.fuint.common.util.DateUtil;
import com.fuint.common.util.TokenUtil;
import com.fuint.common.util.XlsUtil;
import com.fuint.framework.dto.ExcelExportDto;
import com.fuint.framework.exception.BusinessCheckException;
import com.fuint.framework.pagination.PaginationResponse;
import com.fuint.framework.service.ExportService;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import com.fuint.repository.mapper.MtOrderGoodsMapper;
@ -21,12 +24,20 @@ import com.fuint.utils.TimeUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.java.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -77,6 +88,13 @@ public class BackendOrderController extends BaseController {
*/
private SettingService settingService;
/**
*
* */
private ExportService exportService;
private static final Logger logger = LoggerFactory.getLogger(BackendCouponGroupController.class);
/**
*
*
@ -559,5 +577,76 @@ public class BackendOrderController extends BaseController {
}
/**
*
*
* @param request
* @param response
* @throws BusinessCheckException
*/
@ApiOperation(value = "导出模板文件")
@RequestMapping(value = "/exportTemplate", method = RequestMethod.GET)
@CrossOrigin
public void exportTemplate(HttpServletRequest request, HttpServletResponse response) throws BusinessCheckException {
ClassLoader classLoader = this.getClass().getClassLoader();
URL url = classLoader.getResource("");
String srcTemplateFilePath = url.getPath();
ExcelExportDto excelExportDto = new ExcelExportDto();
excelExportDto.setSrcPath(srcTemplateFilePath);
excelExportDto.setSrcTemplateFileName("template" + File.separator + "importTemplate.xlsx");
String filename = "订单模板" + ".xlsx";
try {
OutputStream out = response.getOutputStream();
XlsUtil.setXlsHeader(request, response, filename);
excelExportDto.setOut(out);
exportService.exportLocalFile(excelExportDto);
} catch (Exception e) {
logger.error("导出出错", e);
throw new BusinessCheckException("导出出错");
}
}
// @PreAuthorize("@ss.hasPermi('system:user:import')")
// @PostMapping("/importData")
// public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
// {
// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
// List<SysUser> userList = util.importExcel(file.getInputStream());
// LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
// String operName = loginUser.getUsername();
// String message = userService.importUser(userList, updateSupport, operName);
// return AjaxResult.success(message);
// }
//
// @GetMapping("/importTemplate")
// public AjaxResult importTemplate()
// {
// ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
// return util.importTemplateExcel("用户数据");
// }
// /**
// * 上传文件
// *
// * @param request
// * @throws
// */
// @ApiOperation(value = "上传文件")
// @RequestMapping(value = "/upload/", method = RequestMethod.POST, produces = "text/html;charset=UTF-8")
// @CrossOrigin
// public ResponseObject uploadFile(HttpServletRequest request, @RequestParam("fileInput") MultipartFile file) throws Exception {
// String token = request.getHeader("Access-Token");
// AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
// if (accountInfo == null) {
// return getFailureResult(1001, "请先登录");
// }
//
// String filePath = couponGroupService.saveExcelFile(file, request);
// String uuid = couponGroupService.importSendCoupon(file, accountInfo.getAccountName(), filePath);
// return getSuccessResult(uuid);
// }
}

@ -228,6 +228,7 @@ public class BackendStoreController extends BaseController {
String bankCardNo = params.get("bankCardNo") == null ? "" : CommonUtil.replaceXSS(params.get("bankCardNo").toString());
String status = params.get("status") != null ? params.get("status").toString() : StatusEnum.ENABLED.getKey();
String merchantId = params.get("merchantId").toString();
String mtDetails = params.get("mtDetails").toString();
if ((StringUtil.isEmpty(latitude) || StringUtil.isEmpty(longitude)) && StringUtil.isNotEmpty(address)) {
Map<String, Object> latAndLng = CommonUtil.getLatAndLngByAddress(address);
@ -261,6 +262,7 @@ public class BackendStoreController extends BaseController {
storeInfo.setAlipayAppId(alipayAppId);
storeInfo.setAlipayPrivateKey(alipayPrivateKey);
storeInfo.setAlipayPublicKey(alipayPublicKey);
storeInfo.setMtDetails(mtDetails);
if (StringUtil.isNotEmpty(merchantId)) {
storeInfo.setMerchantId(Integer.parseInt(merchantId));
}

@ -9,11 +9,11 @@ spring.session.redis.namespace=fuint
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=0
# Redis\u670D\u52A1\u5668\u5730\u5740(\u751F\u4EA7)
spring.redis.host=192.168.10.31
spring.redis.host=120.46.159.203
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=7679
spring.redis.port=16379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=
spring.redis.password=a8EYUSoT8wHbuRkX
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.pool.max-active=-1
# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
@ -32,11 +32,13 @@ system.name = \u674E\u5B66\u6B66\u7261\u4E39\u74F7\u5B98\u65B9\u65D7\u8230\u5E97
website.url=https://www.huamar.com/h5/
# \u4E0A\u4F20\u56FE\u7247\u672C\u5730\u5730\u5740
images.root=D:/daima/yshi/fuintBackend/fuint-application/target/classes
images.path=/static/uploadImages/
#images.root=D:/daima/yshi/fuintBackend/fuint-application/target/classes
images.root=D:/download
images.path=/profile/
#images.path=/static/uploadImages/
# \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
images.upload.url=http://192.168.1.103:8999
images.upload.url=http://192.168.10.110:8999
# \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
images.upload.maxSize=5

@ -113,4 +113,7 @@ public class MtStore implements Serializable {
@ApiModelProperty("最后操作人")
private String operator;
@ApiModelProperty("店铺详情")
private String mtDetails;
}

Loading…
Cancel
Save