Просмотр исходного кода

[setId][修复]:setId调用修复

更新 Jenkinsfile

更新 Jenkinsfile

更新 Jenkinsfile
release_toaliyun_real
Stormeye Wu 6 лет назад
committed by Burce
Родитель
Сommit
c4d893afb4
6 измененных файлов: 74 добавлений и 33 удалений
  1. +42
    -0
      Jenkinsfile
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
  3. +4
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  4. +22
    -24
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  5. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  6. +1
    -1
      mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java

+ 42
- 0
Jenkinsfile Просмотреть файл

@@ -0,0 +1,42 @@
pipeline {
agent any
stages {
stage('检出') {
steps {
checkout([$class: 'GitSCM', branches: [[name: env.GIT_BUILD_REF]],
userRemoteConfigs: [[url: env.GIT_REPO_URL, credentialsId: env.CREDENTIALS_ID]]])
}
}
stage('构建') {
steps {
sh 'mvn -version'
echo '构建中...'
sh 'mvn -U clean package -Dmaven.test.skip=true'
echo '构建完成.'
archiveArtifacts(artifacts: '**/target/*.jar', fingerprint: true)
}
}
stage('测试') {
steps {
echo '单元测试中...'
echo '单元测试完成.'
writeFile(file: 'TEST-demo.junit4.AppTest.xml', text: '''
<testsuite name="demo.junit4.AppTest" time="0.053" tests="3" errors="0" skipped="0" failures="0">
<properties>
</properties>
<testcase name="testApp" classname="demo.junit4.AppTest" time="0.003"/>
<testcase name="test1" classname="demo.junit4.AppTest" time="0"/>
<testcase name="test2" classname="demo.junit4.AppTest" time="0"/>
</testsuite>
''')
junit '*.xml'
}
}
stage('部署') {
steps {
echo '部署中...'
echo '部署完成'
}
}
}
}

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java Просмотреть файл

@@ -118,9 +118,9 @@ public class WxBrandController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand");
WxBrand wxBrand = new WxBrand() {{
setName(name);
setId(id);
updateTenantInfo(getTenantInfo());
}};
wxBrand.setId(id);
return wxBrandService.hasBrand(wxBrand);
}



+ 4
- 3
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java Просмотреть файл

@@ -116,10 +116,11 @@ public class WxShopController extends BaseController {
@SystemControllerLog(description = "店铺管理-查询商铺号是否存在")
public ResultData hasShopNumber(String shopNumber, Long id, Integer type) {
logger.debug("[" + getIpAddr() + "] WxShopController::hasShopNumber");
WxShop wxShop = new WxShop();
WxShop wxShop = new WxShop() {{
setShopNumber(shopNumber);
setType(type);
}};
wxShop.setId(id);
wxShop.setShopNumber(shopNumber);
wxShop.setType(type);
wxShop.updateTenantInfo(getTenantInfo());
return wxShopService.hasShopNumber(wxShop);
}


+ 22
- 24
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Просмотреть файл

@@ -2007,11 +2007,10 @@ public class PosServiceImpl implements PosService {
WxMerchantBUser merchantBUser,
WxOrder order, Long memId,
Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime) {
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
WxPayOrder payOrder = new WxPayOrder() {{
Date curDate = new Date();
final IdWorker idWorker = IdWorker.get();
Long id = idWorker.nextId();
setId(id);
setTenantId(merchantBUser.getTenantId());
setCUserId(memId);
setOrderId(order.getId());
@@ -2053,11 +2052,11 @@ public class PosServiceImpl implements PosService {
Long memId, Integer sceneType,
Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String posPayOrderNo) {
// 1. insert into PayOrder
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
WxPayOrder payOrder = new WxPayOrder() {{
Date curDate = new Date();
final IdWorker idWorker = IdWorker.get();
Long id = idWorker.nextId();
setId(id);
setId(payOrderId);
setTenantId(merchantBUser.getTenantId());
setCUserId(memId);
setBUserId(merchantBUser.getId());
@@ -2066,7 +2065,7 @@ public class PosServiceImpl implements PosService {
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(id));
setPayOrderNo(String.valueOf(payOrderId));
setPayAmount(neuPaymentAmount);
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
@@ -2138,11 +2137,11 @@ public class PosServiceImpl implements PosService {
WxOrder order, Long memId,
Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String posPayOrderNo) {
// 1. insert into PayOrder
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
WxPayOrder payOrder = new WxPayOrder() {{
Date curDate = new Date();
final IdWorker idWorker = IdWorker.get();
Long id = idWorker.nextId();
setId(id);
setId(payOrderId);
setTenantId(buUser.getTenantId());
setCUserId(memId);
setBUserId(buUser.getId());
@@ -2151,7 +2150,7 @@ public class PosServiceImpl implements PosService {
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(id));
setPayOrderNo(String.valueOf(payOrderId));
setPayAmount(neuPaymentAmount);
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
@@ -2201,11 +2200,11 @@ public class PosServiceImpl implements PosService {
WxMerchant merchant, WxMerchantBUser buUser, WxOrder order, Long memId,
Integer neuPayOrderType, Long neuPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String neuPayThirdNo) {
// 1. insert into PayOrder
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
WxPayOrder payOrder = new WxPayOrder() {{
Date curDate = new Date();
final IdWorker idWorker = IdWorker.get();
Long id = idWorker.nextId();
setId(id);
setId(payOrderId);
setTenantId(buUser.getTenantId());
setCUserId(memId);
setOrderId(order.getId());
@@ -2213,7 +2212,7 @@ public class PosServiceImpl implements PosService {
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(id));
setPayOrderNo(String.valueOf(payOrderId));
setPayAmount(neuPaymentAmount);
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
@@ -2286,12 +2285,12 @@ public class PosServiceImpl implements PosService {
throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND);
}
// 2. insert into refund order
final IdWorker idWorker = IdWorker.get();
Long refundId = idWorker.nextId();
WxRefundOrder refundPayOrder = new WxRefundOrder() {{
Date curDate = new Date();
final IdWorker idWorker = IdWorker.get();
Long id = idWorker.nextId();
setId(id);
setRefundId(String.valueOf(id));
setId(refundId);
setRefundId(String.valueOf(refundId));
setTenantId(buUser.getTenantId());
setCUserId(memId);
setOrderId(refundOrder.getId());
@@ -2353,12 +2352,11 @@ public class PosServiceImpl implements PosService {
logger.error(ErrorCode.POS_ORDER_HAD_SYNCED.getMessage());
throw new MallinkException(ErrorCode.POS_ORDER_HAD_SYNCED);
}

final IdWorker idWorker = IdWorker.get();
Long orderId = idWorker.nextId();
WxOrder order = new WxOrder() {{
Date curr = new Date();
String bodyStr = "POS支付, 金额: " + posAmount;
final IdWorker idWorker = IdWorker.get();
Long orderId = idWorker.nextId();
setId(orderId);
setTenantId(merchantBUser.getTenantId());
setOrderNumber(orderId);
@@ -2433,11 +2431,11 @@ public class PosServiceImpl implements PosService {
}

// 3. 创建退款订单
final IdWorker idWorker = IdWorker.get();
Long orderId = idWorker.nextId();
WxOrder order = new WxOrder() {{
Date curr = new Date();
String bodyStr = "POS退款, 金额: " + orderAmount;
final IdWorker idWorker = IdWorker.get();
Long orderId = idWorker.nextId();
setId(orderId);
setTenantId(buUser.getTenantId());
setType(EnumOrderType.POSPAY.getCode());


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -1262,11 +1262,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

// 添加payOrder
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
WxPayOrder payOrder = new WxPayOrder() {{
Date curDate = new Date();
final IdWorker idWorker = IdWorker.get();
Long id = idWorker.nextId();
setId(id);
setId(payOrderId);
updateTenantInfo(microOrder);
setCUserId(microOrder.getCUserId());
setOrderId(microOrder.getId());
@@ -1274,7 +1274,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(id));
setPayOrderNo(String.valueOf(payOrderId));
if (microOrder.getPayment() > wxCoupon.getPrice()) {
setPayAmount(wxCoupon.getPrice());
} else {


+ 1
- 1
mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java Просмотреть файл

@@ -96,8 +96,8 @@ public class WxBrandController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand");
WxBrand wxBrand = new WxBrand() {{
setName(name);
setId(id);
}};
wxBrand.setId(id);
wxBrand.updateTenantInfo(getTenantInfo());
return wxBrandService.hasBrand(wxBrand);
}


Загрузка…
Отмена
Сохранить