优化代码 · java110/MicroCommunity@8dc5beb · GitHub
Skip to content

Commit 8dc5beb

Browse files
928255095928255095
committed
优化代码
1 parent 470cd70 commit 8dc5beb

4 files changed

Lines changed: 43 additions & 8 deletions

File tree

‎java110-interface/src/main/java/com/java110/intf/job/IIotInnerServiceSMO.java‎

Lines changed: 3 additions & 0 deletions

‎service-acct/src/main/java/com/java110/acct/cmd/couponProperty/GiftCouponPropertyCmd.java‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.java110.intf.acct.ICouponPropertyPoolDetailV1InnerServiceSMO;
1717
import com.java110.intf.acct.ICouponPropertyPoolV1InnerServiceSMO;
1818
import com.java110.intf.acct.ICouponPropertyUserV1InnerServiceSMO;
19+
import com.java110.intf.job.IIotInnerServiceSMO;
1920
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
2021
import com.java110.po.coupon.CouponPropertyPoolPo;
2122
import com.java110.po.coupon.CouponPropertyPoolDetailPo;
@@ -24,6 +25,7 @@
2425
import com.java110.utils.lock.DistributedLock;
2526
import com.java110.utils.util.Assert;
2627
import com.java110.utils.util.DateUtil;
28+
import com.java110.utils.util.ListUtil;
2729
import com.java110.vo.ResultVo;
2830
import org.springframework.beans.factory.annotation.Autowired;
2931

@@ -76,6 +78,9 @@ public class GiftCouponPropertyCmd extends Cmd{
7678
@Autowired
7779
private ICouponPropertyUserV1InnerServiceSMO couponPropertyUserV1InnerServiceSMOImpl;
7880

81+
@Autowired
82+
private IIotInnerServiceSMO iotInnerServiceSMOImpl;
83+
7984

8085
@Override
8186
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -93,7 +98,7 @@ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJso
9398
ownerDto.setCommunityId(reqJson.getString("communityId"));
9499
List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
95100

96-
if(ownerDtos == null || ownerDtos.size()< 1){
101+
if(ListUtil.isNull(ownerDtos)){
97102
throw new CmdException("根据手机号未查询到业主");
98103
}
99104

@@ -106,7 +111,7 @@ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJso
106111
couponPropertyPoolDto.setCppId(reqJson.getString("cppId"));
107112
List<CouponPropertyPoolDto> couponPropertyPoolDtos = couponPropertyPoolV1InnerServiceSMOImpl.queryCouponPropertyPools(couponPropertyPoolDto);
108113

109-
if (couponPropertyPoolDtos == null || couponPropertyPoolDtos.size() < 1) {
114+
if (ListUtil.isNull(couponPropertyPoolDtos)) {
110115
return;
111116
}
112117

@@ -152,7 +157,6 @@ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJso
152157
if(flag < 1){
153158
throw new CmdException("赠送失败");
154159
}
155-
156160
//用户账户写入优惠券
157161
CouponPropertyUserPo couponPropertyUserPo = new CouponPropertyUserPo();
158162
couponPropertyUserPo.setCommunityId(couponPropertyPoolDtos.get(0).getCommunityId());
@@ -168,10 +172,12 @@ public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJso
168172
couponPropertyUserPo.setTel(ownerDtos.get(0).getLink());
169173
couponPropertyUserPo.setValue(value);
170174
couponPropertyUserPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
171-
flag = couponPropertyUserV1InnerServiceSMOImpl.saveCouponPropertyUser(couponPropertyUserPo);
172-
173-
if(flag < 1){
174-
throw new CmdException("保存赠送业主记录失败");
175+
// todo 充点券 同步物联网
176+
if(CouponPropertyUserDto.TO_TYPE_CHARGE.equals(couponPropertyPoolDtos.get(0).getToType())){
177+
// todo 优惠券写到物联网系统
178+
iotInnerServiceSMOImpl.sendChargeCoupon(couponPropertyUserPo);
179+
}else{
180+
couponPropertyUserV1InnerServiceSMOImpl.saveCouponPropertyUser(couponPropertyUserPo);
175181
}
176182
} finally {
177183
DistributedLock.releaseDistributedLock(requestId, key);

‎service-job/src/main/java/com/java110/job/adapt/payment/coupon/PayFeeGiftCouponAdapt.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
2222
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
2323
import com.java110.intf.fee.IFeeInnerServiceSMO;
24+
import com.java110.intf.job.IIotInnerServiceSMO;
2425
import com.java110.job.adapt.DatabusAdaptImpl;
2526
import com.java110.po.coupon.CouponPropertyPoolPo;
2627
import com.java110.po.coupon.CouponPropertyPoolDetailPo;
@@ -84,6 +85,9 @@ public class PayFeeGiftCouponAdapt extends DatabusAdaptImpl {
8485
@Autowired
8586
private ICouponPropertyUserV1InnerServiceSMO couponPropertyUserV1InnerServiceSMOImpl;
8687

88+
@Autowired
89+
private IIotInnerServiceSMO iotInnerServiceSMOImpl;
90+
8791

8892
@Autowired
8993
private IComputeFeeSMO computeFeeSMOImpl;
@@ -303,7 +307,13 @@ private void doGiftCoupon(CouponRuleCppsDto couponRuleCppsDto, FeeDto feeDto, St
303307
couponPropertyUserPo.setTel(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_OWNER_LINK));
304308
couponPropertyUserPo.setValue(value);
305309
couponPropertyUserPo.setStartTime(startTime);
306-
couponPropertyUserV1InnerServiceSMOImpl.saveCouponPropertyUser(couponPropertyUserPo);
310+
// todo 充点券 同步物联网
311+
if(CouponPropertyUserDto.TO_TYPE_CHARGE.equals(couponPropertyPoolDtos.get(0).getToType())){
312+
// todo 优惠券写到物联网系统
313+
iotInnerServiceSMOImpl.sendChargeCoupon(couponPropertyUserPo);
314+
}else{
315+
couponPropertyUserV1InnerServiceSMOImpl.saveCouponPropertyUser(couponPropertyUserPo);
316+
}
307317
//这里更新功能 关闭 因为优惠券有有效期 如果 修改显然不合适 modify by 2022-11-24 wuxw
308318
// }else{
309319
// couponPropertyUserPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());

‎service-job/src/main/java/com/java110/job/smo/impl/IotInnerServiceSMOImpl.java‎

Lines changed: 16 additions & 0 deletions

0 commit comments

Comments
 (0)