xtrade / order-service · Commits

Commit 98671df375e7e4eda1d6570d0049b34944a6b695

Authored by zhangxing
2 parents e144b9a7 19e5b31d
build: skipped

Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git

Inline Side-by-side
Showing 4 changed files with 10 additions and 6 deletions
src/main/java/com/diligrp/xtrade/product/domain/entity/MerchantDo.java
  View file @98671df
... ... @@ -19,10 +19,10 @@ public class MerchantDo extends BaseDo {
19 19 /**类型 {@link AccountType}*/
20 20 private Integer type;
21 21  
22   - //主账号
  22 + /**主账号*/
23 23 private Long accountId;
24 24  
25   - //账户名称
  25 + /**账户名称*/
26 26 private String accountName;
27 27  
28 28 //商户状态
... ...
src/main/java/com/diligrp/xtrade/product/repository/MerchantRepository.java
  View file @98671df
... ... @@ -43,7 +43,6 @@ public class MerchantRepository implements IMerchantRepository {
43 43 IKeyGenerator keyGenerator = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.MERCHANT_SEQUENCE);
44 44 newMerchantDo.setMerId(keyGenerator.nextId());
45 45 newMerchantDo.setMarketId("SY001");
46   - newMerchantDo.setCreatedTime(LocalDateTime.now());
47 46 merchantDao.insert(newMerchantDo);
48 47 }
49 48  
... ...
src/main/java/com/diligrp/xtrade/product/service/impl/MerchantServiceImpl.java
  View file @98671df
... ... @@ -27,7 +27,7 @@ public class MerchantServiceImpl implements MerchantService {
27 27 private AccountService accountService;
28 28  
29 29 @Override
30   - @Transactional
  30 + @Transactional(rollbackFor = Exception.class)
31 31 public MerchantResponseDto create(MerchantRequestDto requestDto) throws Exception {
32 32 OperatorDo operatorDo = accountRepository.getOperator();
33 33 requestDto.setAccountId(operatorDo.getAccountId());
... ...
src/main/resources/bootstrap.yml
  View file @98671df
... ... @@ -16,9 +16,14 @@ spring:
16 16 prefix: ${spring.application.name}
17 17 context-path: /nacos
18 18 file-extension: properties
  19 + extension-configs:
  20 + - dataId: common.properties
  21 + refresh: false
19 22 profiles:
20 23 active: dev
21   -
22 24 mybatis:
23 25 mapper-locations: classpath:mapping/com/diligrp/xtrade/*product/*Dao.xml
24   - type-aliases-package: com.diligrp.xtrade.*.domain.entity
25 26 \ No newline at end of file
  27 + type-aliases-package: com.diligrp.xtrade.*.domain.entity
  28 +logging:
  29 + level:
  30 + com.diligrp.xtrade.product.dao: debug
... ...