支付的 信息回填 , 角色模板 排序

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -100,7 +101,16 @@ public class PointsGoodPayServiceImpl implements PointsGoodPayService {
             record.setStatus("待支付");
             record.setIsDel(1);
             goodsRecordService.save(record);
-            return payService.ltPayPointsGoods(ip, param, record.getId());
+            CzgResult<Map<String, Object>> result = CzgResult.success();
+            CzgResult<Map<String, Object>> mapCzgResult = payService.ltPayPointsGoods(ip, param, record.getId());
+            if (200 != mapCzgResult.getCode()) {
+                return mapCzgResult;
+            }
+            Map<String, Object> resultMap = new HashMap<>(2);
+            resultMap.put("payInfo", mapCzgResult.getData());
+            resultMap.put("goodsRecord", record);
+            result.setData(resultMap);
+            return result;
         }
 
         //正常处理
@@ -155,6 +165,7 @@ public class PointsGoodPayServiceImpl implements PointsGoodPayService {
             ShopCoupon coupon = shopCouponService.getById(goods.getCouponId());
             if (coupon != null) {
                 record.setCouponJson(JSONObject.toJSONString(coupon));
+                record.fillCouponInfo();
             }
             record.setStatus("已完成");
             record.setCheckoutTime(LocalDateTime.now());