From d6eacbd54ee7111972a04e13d50a7d1f77dfd105 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 四月 2023 17:45:11 +0800
Subject: [PATCH] add product category functiong
---
service-acct/src/main/java/com/java110/acct/cmd/integral/CustomSendIntegralCmd.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/cmd/integral/CustomSendIntegralCmd.java b/service-acct/src/main/java/com/java110/acct/cmd/integral/CustomSendIntegralCmd.java
index ffb9eaf..a36fdf2 100644
--- a/service-acct/src/main/java/com/java110/acct/cmd/integral/CustomSendIntegralCmd.java
+++ b/service-acct/src/main/java/com/java110/acct/cmd/integral/CustomSendIntegralCmd.java
@@ -8,7 +8,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.doc.annotation.*;
import com.java110.dto.account.AccountDto;
-import com.java110.dto.integralConfig.IntegralConfigDto;
+import com.java110.dto.integral.IntegralConfigDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.acct.IAccountInnerServiceSMO;
@@ -92,6 +92,8 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+ String createUserId = context.getReqHeaders().get("user-id");
+
//鍚戠Н鍒嗚处鎴蜂腑鍏呭�肩Н鍒�
AccountDto accountDto = new AccountDto();
accountDto.setLink(reqJson.getString("link"));
@@ -114,7 +116,7 @@
throw new CmdException("鎵ｆ澶辫触");
}
- doGiftIntegral(accountDtos.get(0), reqJson);
+ doGiftIntegral(accountDtos.get(0), reqJson,createUserId);
}
@@ -137,7 +139,7 @@
accountPo.setAcctId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_acctId));
accountPo.setObjId(reqJson.getString("objId"));
accountPo.setObjType(AccountDto.OBJ_TYPE_PERSON);
- accountPo.setAcctType(AccountDto.ACCT_TYPE_CASH);
+ accountPo.setAcctType(AccountDto.ACCT_TYPE_INTEGRAL);
accountPo.setAcctName(acctName);
accountPo.setPartId(reqJson.getString("communityId"));
accountPo.setLink(reqJson.getString("link"));
@@ -172,7 +174,7 @@
throw new CmdException("涓氫富涓嶅瓨鍦�");
}
- private void doGiftIntegral(AccountDto accountDto, JSONObject reqJson) {
+ private void doGiftIntegral(AccountDto accountDto, JSONObject reqJson,String createUserId) {
IntegralConfigDto integralConfigDto = new IntegralConfigDto();
integralConfigDto.setCommunityId(reqJson.getString("communityId"));
@@ -181,10 +183,18 @@
throw new CmdException("绉垎瑙勫垯涓嶅瓨鍦紝璇锋坊鍔�");
}
- UserDto userDto = new UserDto();
- userDto.setTel(reqJson.getString("link"));
- List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
- Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+// UserDto userDto = new UserDto();
+// userDto.setTel(reqJson.getString("link"));
+// List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+// Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+
+ OwnerDto tmpOwnerDto = new OwnerDto();
+ tmpOwnerDto.setLink(reqJson.getString("link"));
+ tmpOwnerDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(tmpOwnerDto);
+ if (ownerDtos != null && ownerDtos.size() > 0) {
+ return;
+ }
//鍏堝姞鏄庣粏
IntegralGiftDetailPo integralGiftDetailPo = new IntegralGiftDetailPo();
integralGiftDetailPo.setCommunityId(reqJson.getString("communityId"));
@@ -197,9 +207,9 @@
integralGiftDetailPo.setRuleId("-1");
integralGiftDetailPo.setRuleName(reqJson.getString("ruleName"));
integralGiftDetailPo.setQuantity(reqJson.getString("quantity"));
- integralGiftDetailPo.setCreateUserId(userDtos.get(0).getUserId());
- integralGiftDetailPo.setUserName(userDtos.get(0).getName());
- integralGiftDetailPo.setTel(userDtos.get(0).getTel());
+ integralGiftDetailPo.setCreateUserId(createUserId);
+ integralGiftDetailPo.setUserName(ownerDtos.get(0).getName());
+ integralGiftDetailPo.setTel(ownerDtos.get(0).getLink());
integralGiftDetailV1InnerServiceSMOImpl.saveIntegralGiftDetail(integralGiftDetailPo);
}
--
Gitblit v1.8.0