插入8字查询记录

nbjk-admin/src/main/java/com/miaxis/app/controller/birthday/BirthdayLogController.java

@@ -38,10 +38,6 @@ public class BirthdayLogController extends BaseController {
     })
     public ResponsePageInfo<BirthdayLog> list(@ModelAttribute BirthdayLog birthdayLog) {
         startPage();
-        Long bbq = SecurityUtils.getLoginUser().getStudent().getId();
-        Long bbq2 = SecurityUtils.getLoginUser().getUser().getUserId();
-        System.out.println(bbq);
-        System.out.println(bbq2);
         birthdayLog.setUserId(SecurityUtils.getLoginUser().getStudent().getId());
         List<BirthdayLog> list = birthdayLogService.selectBirthdayLogList(birthdayLog);
         return toResponsePageInfo(list);
@@ -73,10 +69,11 @@ public class BirthdayLogController extends BaseController {
      */
     @PostMapping
     @ApiOperation("新增查询记录")
-    public Response<Integer> add(@RequestBody BirthdayLog birthdayLog) {
+    public Response<BirthdayLog> add(@RequestBody BirthdayLog birthdayLog) {
         Long userId = SecurityUtils.getLoginUser().getStudent().getId();
         birthdayLog.setUserId(userId);
-        return toResponse(birthdayLogService.saveBirthdayLog(birthdayLog) ? 1 : 0);
+        BirthdayLog birthdayLogDb = birthdayLogService.saveBirthdayLog(birthdayLog);
+        return Response.success(birthdayLogDb);
     }
 
 

nbjk-admin/src/main/java/com/miaxis/app/controller/gan/GanZhiController.java

@@ -62,8 +62,8 @@ public class GanZhiController extends BaseController {
         Map<String, String> reportMap = new TreeMap<String, String>();
 
 
-        Date birthDay = ganZhiDto.getBirthDay();
-        Lunar lunar = Lunar.fromDate(birthDay);
+        Date birthday = ganZhiDto.getBirthday();
+        Lunar lunar = Lunar.fromDate(birthday);
         GanZhiDaYunVo ganZhiDaYunVo = new GanZhiDaYunVo();
         ganZhiDaYunVo.setLunar(lunar);
         System.out.println("农历：" + lunar.getYear() + "年(生肖" + lunar.getYearShengXiao() + ")" + lunar.getMonth() + "月" + lunar.getDay() + "日" + lunar.getTime() + "时");
@@ -124,7 +124,7 @@ public class GanZhiController extends BaseController {
 
         GanZhiVo ganZhiVo = new GanZhiVo();
         ganZhiVo.setNongDay(lunar.getYear() + "年(生肖" + lunar.getYearShengXiao() + ")" + lunar.getMonth() + "月" + lunar.getDay() + "日" + lunar.getTime() + "时");
-        ganZhiVo.setBirthDay(ganZhiDto.getBirthDay());
+        ganZhiVo.setBirthday(ganZhiDto.getBirthday());
         ganZhiVo.setGanZhiRowVoList(ganZhiRowVoList);
         ganZhiVo.setFiveCountMap(fiveCountMap);
         ganZhiVo.setShiShenCountMap(shiShenCountMap);

nbjk-service/src/main/java/com/miaxis/birthday/mapper/BirthdayLogMapper.java

@@ -23,4 +23,7 @@ public interface BirthdayLogMapper extends BaseMapper<BirthdayLog> {
 
     public int selectBirthdayLogCount(BirthdayLog birthdayLog);
 
+    public BirthdayLog selectBirthdayLogId(BirthdayLog birthdayLog);
+
+
 }

nbjk-service/src/main/java/com/miaxis/birthday/service/IBirthdayLogService.java

@@ -18,7 +18,7 @@ public interface IBirthdayLogService extends IService<BirthdayLog>{
      * @param birthdayLog 查询记录
      * @return 查询记录集合
      */
-    public List<BirthdayLog> selectBirthdayLogList(BirthdayLog birthdayLog);
+    List<BirthdayLog> selectBirthdayLogList(BirthdayLog birthdayLog);
 
-    boolean saveBirthdayLog(BirthdayLog birthdayLog);
+    BirthdayLog saveBirthdayLog(BirthdayLog birthdayLog);
 }

nbjk-service/src/main/java/com/miaxis/birthday/service/impl/BirthdayLogServiceImpl.java

@@ -34,6 +34,7 @@ public class BirthdayLogServiceImpl extends ServiceImpl<BirthdayLogMapper, Birth
     }
 
 
+
     /**
      * 查询记录表
      *
@@ -41,16 +42,18 @@ public class BirthdayLogServiceImpl extends ServiceImpl<BirthdayLogMapper, Birth
      * @return 查询记录
      */
     @Override
-    public boolean saveBirthdayLog(BirthdayLog birthdayLog){
+    public BirthdayLog saveBirthdayLog(BirthdayLog birthdayLog){
         int count = birthdayLogMapper.selectBirthdayLogCount(birthdayLog);
 
         if(count>0) {
             log.info("当前查询8字已存在");
-            return true;
+            return birthdayLogMapper.selectBirthdayLogId(birthdayLog);
         } else {
-            return this.save(birthdayLog);
+            this.save(birthdayLog);
+            return birthdayLogMapper.selectBirthdayLogId(birthdayLog);
         }
 
     }
 
+
 }

nbjk-service/src/main/java/com/miaxis/gan/dto/GanZhiDto.java

@@ -26,7 +26,7 @@ public class GanZhiDto {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "出生日期 yyyy-MM-dd HH:mm:ss")
-    private Date birthDay;
+    private Date birthday;
 
     @ApiModelProperty(value = "是否保存 0:不保存 1保存")
     private Integer isSave;

nbjk-service/src/main/java/com/miaxis/gan/service/impl/GanZhiServiceImpl.java

@@ -691,7 +691,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         }
 
         //判断当天是否是节气，如果在节前前， 月柱修改
-        Date d1 = ganZhiDto.getBirthDay();
+        Date d1 = ganZhiDto.getBirthday();
         Lunar lunar = Lunar.fromDate(d1);
         List<JieQiVo> list = jieQiMapper.selectJiiQiFb(d1);
         if (lunar.getJieQi() != null && !"".equals(lunar.getJieQi())) {

nbjk-service/src/main/java/com/miaxis/gan/vo/GanZhiVo.java

@@ -29,8 +29,7 @@ public class GanZhiVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "(公历)出生日期 yyyy-MM-dd HH:mm:ss")
-    private Date birthDay;
-
+    private Date birthday;
     @ApiModelProperty(value = "(农历)出生日期")
     private String nongDay;
 

nbjk-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -154,7 +154,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         receiverMap.put("description", "分到个人");  //合作合伙
         ObjectMapper objectMapper = new ObjectMapper();
         String receiverMapJson = objectMapper.writeValueAsString(receiverMap);
-        sortMap.put("receiver", receiverMapJson);
+        sortMap.put("receivers", receiverMapJson);
 
         WXPayConfig config = new WxPayConfigImpl();
         String sign = WXPayUtil.generateSignature(sortMap, config.getKey(), WXPayConstants.SignType.HMACSHA256);
@@ -164,7 +164,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         String xmlStr = pay.requestWithCert(url, sortMap, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs());
         Map<String, String> resMap = XmlUtil.xmlToMap(xmlStr);
         if (!"SUCCESS".equals(resMap.get("return_code")) || !"SUCCESS".equals(resMap.get("result_code"))) {
-            throw new CustomException("微信添加分账出错");
+            throw new CustomException("微信分账出错");
         }
         //更新成交订单表
         OrderInfo orderInfo = orderInfoService.getByOutTradeNo(wxOrder.getOutTradeNo());

nbjk-service/src/main/resources/mapper/birthday/BirthdayLogMapper.xml

@@ -41,5 +41,15 @@
         </where>
     </select>
 
+    <select id="selectBirthdayLogId" parameterType="BirthdayLog" resultMap="BirthdayLogResult">
+        select * from birthday_log
+        <where>
+            <if test="name != null  and name != ''">and name = #{name}</if>
+            <if test="sex != null  and sex != ''">and sex = #{sex}</if>
+            <if test="birthday != null ">and birthday = #{birthday}</if>
+            <if test="userId != null ">and user_id = #{userId}</if>
+        </where>
+    </select>
+
 
 </mapper>