Merge branch 'dev-new' into dev-new-rabbitmq

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java

@@ -256,6 +256,9 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
             giftBalancePay = stringBigDecimalMap.get("giftBalancePay");
         }
 
+        // 更新支付金额 = 本金支付金额 + 赠送金支付金额
+        chargeAmount = principalBalancePay.add(giftBalancePay);
+
         // 更新会员钱包 全部金额都用于支付订单
         UpdateMemberBalanceDTO updateMemberBalanceDTO = UpdateMemberBalanceDTO.builder()
                 .memberId(memberId)