Merge branch 'pre' into 'master'

Pre

See merge request !93

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -67,7 +67,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
         LambdaUpdateWrapper<AdamMemberRefund> memberRefundLambdaUpdateWrapper = Wrappers.lambdaUpdate(AdamMemberRefund.class)
                 .eq(AdamMemberRefund::getRefundNo, refundNo);
         memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getRefundAt, refundAt);
-        memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getRefundReason, refundError);
+        memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getRepayReason, refundError);
         memberRefundLambdaUpdateWrapper.set(AdamMemberRefund::getUpdatedAt, now);
 
         switch (status) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java

@@ -22,8 +22,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 @Slf4j
@@ -90,9 +92,13 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         List<CandyCouponCode> initCouponCodeList = new ArrayList<>();
         LocalDateTime now = LocalDateTime.now();
         Integer eventAmt = mgtCoupon.getEventAmt();
+        Base64.Encoder encoder = Base64.getEncoder();
         for (int i = 0; i < eventAmt; i++) {
             CandyCouponCode couponCode = new CandyCouponCode();
-            couponCode.setCcode(RandomStringUtils.randomAlphanumeric(16));
+
+            String lStrEncoder = encoder.encodeToString((System.nanoTime() + RandomStringUtils.randomNumeric(3)).getBytes(StandardCharsets.UTF_8));
+
+            couponCode.setCcode(lStrEncoder.replace("=", ""));
             couponCode.setCouponId(coupon.getCouponId());
             couponCode.setState(0);
             couponCode.setCreatedAt(now);